PERFORCE change 59892 for review

Peter Wemm peter at FreeBSD.org
Mon Aug 16 15:27:17 PDT 2004 

http://perforce.freebsd.org/chv.cgi?CH=59892

Change 59892 by peter at peter_daintree on 2004/08/16 22:26:15

	IFC @59890

Affected files ...

.. //depot/projects/hammer/MAINTAINERS#27 integrate
.. //depot/projects/hammer/Makefile.inc1#56 integrate
.. //depot/projects/hammer/bin/dd/args.c#7 integrate
.. //depot/projects/hammer/bin/dd/dd.1#6 integrate
.. //depot/projects/hammer/bin/dd/dd.c#6 integrate
.. //depot/projects/hammer/bin/dd/dd.h#6 integrate
.. //depot/projects/hammer/bin/dd/extern.h#4 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#6 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/README#6 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#6 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#10 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#6 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/omapip/test.c#3 integrate
.. //depot/projects/hammer/contrib/top/commands.c#4 integrate
.. //depot/projects/hammer/contrib/top/top.c#5 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#23 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#25 integrate
.. //depot/projects/hammer/etc/rc.d/jail#8 integrate
.. //depot/projects/hammer/etc/services#11 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#26 integrate
.. //depot/projects/hammer/include/Makefile#28 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/_set_tp.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#15 integrate
.. //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#6 integrate
.. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#7 integrate
.. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#3 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#8 integrate
.. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#8 integrate
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/sparc64/include/pthread_md.h#4 integrate
.. //depot/projects/hammer/lib/libpthread/pthread.map#10 integrate
.. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#11 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_symbols.c#1 branch
.. //depot/projects/hammer/lib/libthr/Makefile#6 integrate
.. //depot/projects/hammer/lib/libthread_db/Makefile#4 integrate
.. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#3 integrate
.. //depot/projects/hammer/lib/libthread_db/libpthread_db.h#2 integrate
.. //depot/projects/hammer/libexec/tftpd/tftpd.c#8 integrate
.. //depot/projects/hammer/release/Makefile#51 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#53 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#9 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#5 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/simple_httpd.c#4 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#16 integrate
.. //depot/projects/hammer/sbin/geom/class/Makefile#4 integrate
.. //depot/projects/hammer/sbin/geom/class/raid3/Makefile#1 branch
.. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#1 branch
.. //depot/projects/hammer/sbin/savecore/savecore.c#6 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#21 integrate
.. //depot/projects/hammer/share/man/man4/de.4#4 integrate
.. //depot/projects/hammer/share/man/man4/inet.4#11 integrate
.. //depot/projects/hammer/share/man/man4/mpt.4#4 integrate
.. //depot/projects/hammer/share/man/man4/rl.4#10 integrate
.. //depot/projects/hammer/share/man/man4/rue.4#7 integrate
.. //depot/projects/hammer/share/man/man4/trm.4#2 integrate
.. //depot/projects/hammer/share/man/man4/vr.4#5 integrate
.. //depot/projects/hammer/share/man/man7/hier.7#22 integrate
.. //depot/projects/hammer/share/man/man7/release.7#21 integrate
.. //depot/projects/hammer/share/man/man9/vslock.9#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#35 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux.h#4 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#31 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#51 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#40 integrate
.. //depot/projects/hammer/sys/amd64/linux32/Makefile#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux.h#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_dummy.c#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_genassym.c#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_ipc64.h#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_locore.s#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/syscalls.conf#1 branch
.. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#1 branch
.. //depot/projects/hammer/sys/boot/Makefile#13 integrate
.. //depot/projects/hammer/sys/boot/ofw/common/main.c#6 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#3 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#3 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#4 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.h#2 integrate
.. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/sparc64/boot1/boot1.c#5 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#10 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#22 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#10 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#7 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#18 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#8 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ipc.h#3 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_mib.c#5 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#21 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_signal.c#9 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#12 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#13 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#7 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#8 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#20 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#14 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#18 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#18 integrate
.. //depot/projects/hammer/sys/conf/NOTES#58 integrate
.. //depot/projects/hammer/sys/conf/files#74 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#53 integrate
.. //depot/projects/hammer/sys/conf/files.i386#40 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#22 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#33 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#11 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#21 integrate
.. //depot/projects/hammer/sys/conf/options#50 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#30 integrate
.. //depot/projects/hammer/sys/conf/options.i386#27 integrate
.. //depot/projects/hammer/sys/conf/options.ia64#11 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#22 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#12 integrate
.. //depot/projects/hammer/sys/dev/amr/amrio.h#4 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#32 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#40 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#18 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#14 integrate
.. //depot/projects/hammer/sys/dev/cp/cpddk.c#2 integrate
.. //depot/projects/hammer/sys/dev/cp/cpddk.h#2 integrate
.. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#8 integrate
.. //depot/projects/hammer/sys/dev/exca/exca.c#9 integrate
.. //depot/projects/hammer/sys/dev/exca/excavar.h#4 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#10 integrate
.. //depot/projects/hammer/sys/dev/ofw/openfirm.c#6 integrate
.. //depot/projects/hammer/sys/dev/ofw/openfirm.h#4 integrate
.. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#10 integrate
.. //depot/projects/hammer/sys/dev/ofw/openpromio.c#6 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccard.c#18 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_isa.c#2 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ubser.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/udbp.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ufm.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/uhid.c#15 integrate
.. //depot/projects/hammer/sys/dev/usb/uhub.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/ulpt.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#24 integrate
.. //depot/projects/hammer/sys/dev/usb/ums.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/urio.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#9 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_subr.c#14 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#5 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#16 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#1 branch
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#1 branch
.. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#1 branch
.. //depot/projects/hammer/sys/i386/conf/NOTES#49 integrate
.. //depot/projects/hammer/sys/i386/i386/legacy.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#30 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_watchdog.c#2 integrate
.. //depot/projects/hammer/sys/i386/include/vmparam.h#8 integrate
.. //depot/projects/hammer/sys/i386/linux/linux.h#3 integrate
.. //depot/projects/hammer/sys/ia64/disasm/disasm_decode.c#2 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#39 integrate
.. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#7 integrate
.. //depot/projects/hammer/sys/ia64/include/pcb.h#7 integrate
.. //depot/projects/hammer/sys/isa/psm.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#22 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#22 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#22 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#49 integrate
.. //depot/projects/hammer/sys/modules/Makefile#50 integrate
.. //depot/projects/hammer/sys/modules/agp/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/cbb/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/geom/Makefile#9 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_raid3/Makefile#1 branch
.. //depot/projects/hammer/sys/netinet/icmp_var.h#4 integrate
.. //depot/projects/hammer/sys/netinet/if_atm.c#5 integrate
.. //depot/projects/hammer/sys/netinet/if_atm.h#2 integrate
.. //depot/projects/hammer/sys/netinet/igmp.h#3 integrate
.. //depot/projects/hammer/sys/netinet/in.c#9 integrate
.. //depot/projects/hammer/sys/netinet/in.h#14 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#19 integrate
.. //depot/projects/hammer/sys/netinet/in_proto.c#12 integrate
.. //depot/projects/hammer/sys/netinet/in_var.h#7 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#13 integrate
.. //depot/projects/hammer/sys/netinet/ip_gre.c#11 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#19 integrate
.. //depot/projects/hammer/sys/netinet/ip_id.c#5 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#21 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.h#5 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#25 integrate
.. //depot/projects/hammer/sys/netinet/tcp.h#8 integrate
.. //depot/projects/hammer/sys/netinet/tcp_debug.h#4 integrate
.. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#6 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#35 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#20 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#2 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#26 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#21 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timer.c#10 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timer.h#5 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#19 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#16 integrate
.. //depot/projects/hammer/sys/netinet/tcpip.h#3 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#21 integrate
.. //depot/projects/hammer/sys/netinet/udp_var.h#3 integrate
.. //depot/projects/hammer/sys/pci/agp.c#15 integrate
.. //depot/projects/hammer/sys/pci/agp_amd.c#11 integrate
.. //depot/projects/hammer/sys/pci/agp_amd64.c#1 branch
.. //depot/projects/hammer/sys/pci/agp_sis.c#11 integrate
.. //depot/projects/hammer/sys/pci/agp_via.c#13 integrate
.. //depot/projects/hammer/sys/pci/agpreg.h#9 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#18 integrate
.. //depot/projects/hammer/sys/powerpc/include/memdev.h#1 branch
.. //depot/projects/hammer/sys/powerpc/include/ofw_machdep.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/pmap.h#8 integrate
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcib_pci.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/macio.c#9 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/locore.S#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mem.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/ofwmagic.S#3 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#27 integrate
.. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#30 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mem.c#11 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/uio_machdep.c#5 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#5 integrate
.. //depot/projects/hammer/sys/vm/vm.h#4 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#21 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#43 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#9 integrate
.. //depot/projects/hammer/tools/regression/geom_raid3/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/runtests.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-1.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-2.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-3.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-4.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-5.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-6.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-7.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-8.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_raid3/test-9.sh#1 branch
.. //depot/projects/hammer/tools/regression/tls/ttls1/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/tls/ttls2/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/tls/ttls3/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.all#3 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#22 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.hungarian#1 branch
.. //depot/projects/hammer/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all#1 branch
.. //depot/projects/hammer/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok#1 branch
.. //depot/projects/hammer/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek#1 branch
.. //depot/projects/hammer/usr.bin/fetch/fetch.c#13 integrate
.. //depot/projects/hammer/usr.bin/m4/eval.c#3 integrate
.. //depot/projects/hammer/usr.bin/m4/extern.h#2 integrate
.. //depot/projects/hammer/usr.bin/m4/main.c#4 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.1#4 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#10 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#7 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.8#5 integrate
.. //depot/projects/hammer/usr.sbin/eeprom/eeprom.8#2 integrate
.. //depot/projects/hammer/usr.sbin/eeprom/ofw_options.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#5 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#11 integrate

Differences ...

==== //depot/projects/hammer/MAINTAINERS#27 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.98 2004/08/05 21:01:27 pjd Exp $
+$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $
 
 subsystem	login	notes
 -----------------------------
@@ -96,6 +96,7 @@
 geom_label	pjd	Pre-commit review preferred.
 geom_mirror	pjd	Pre-commit review preferred.
 geom_nop	pjd	Pre-commit review preferred.
+geom_raid3	pjd	Pre-commit review preferred.
 geom_stripe	pjd	Pre-commit review preferred.
 sbin/geom	pjd	Pre-commit review preferred.
 nfs		alfred	Will be happy to review code, but not mandatory.

==== //depot/projects/hammer/Makefile.inc1#56 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.437 2004/08/11 16:45:20 harti Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.438 2004/08/16 18:17:14 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -62,10 +62,7 @@
 .if !defined(NOSHARE)
 SUBDIR+=share
 .endif
-.if ${MACHINE_ARCH} != "alpha"
-SUBDIR+=sys
-.endif
-SUBDIR+=usr.bin usr.sbin etc
+SUBDIR+=sys usr.bin usr.sbin etc
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.

==== //depot/projects/hammer/bin/dd/args.c#7 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.39 2004/07/31 15:13:08 pjd Exp $");
+__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.40 2004/08/15 19:10:05 rwatson Exp $");
 
 #include <sys/types.h>
 
@@ -58,6 +58,7 @@
 static void	f_conv(char *);
 static void	f_count(char *);
 static void	f_files(char *);
+static void	f_fillchar(char *);
 static void	f_ibs(char *);
 static void	f_if(char *);
 static void	f_obs(char *);
@@ -77,6 +78,7 @@
 	{ "conv",	f_conv,		0,	 0 },
 	{ "count",	f_count,	C_COUNT, C_COUNT },
 	{ "files",	f_files,	C_FILES, C_FILES },
+	{ "fillchar",	f_fillchar,	C_FILL,	 C_FILL },
 	{ "ibs",	f_ibs,		C_IBS,	 C_BS|C_IBS },
 	{ "if",		f_if,		C_IF,	 C_IF },
 	{ "iseek",	f_skip,		C_SKIP,	 C_SKIP },
@@ -224,6 +226,16 @@
 }
 
 static void
+f_fillchar(char *arg)
+{
+
+	if (strlen(arg) != 1)
+		errx(1, "need exactly one fill char");
+
+	fill_char = arg[0];
+}
+
+static void
 f_ibs(char *arg)
 {
 	uintmax_t res;

==== //depot/projects/hammer/bin/dd/dd.1#6 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD: src/bin/dd/dd.1,v 1.24 2004/05/16 21:34:14 ru Exp $
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.25 2004/08/15 19:10:05 rwatson Exp $
 .\"
 .Dd March 5, 2004
 .Dt DD 1
@@ -84,6 +84,13 @@
 .Ar n
 input files before terminating.
 This operand is only applicable when the input device is a tape.
+.It Cm fillchar Ns = Ns Ar c
+When padding a block in conversion mode or due to use of
+.Cm noerror
+and
+.Cm sync
+modes, fill with the specified ASCII character, rather than using a space
+or nul.
 .It Cm ibs Ns = Ns Ar n
 Set the input block size to
 .Ar n
@@ -247,6 +254,10 @@
 bytes (or with spaces if a block oriented conversion value was
 specified) and processed as a normal input buffer.
 If the
+.Cm fillchar
+option is specified, the fill char provided on the command line will override
+the automatic selection of fill character.
+If the
 .Cm sync
 conversion is not specified, the input block is omitted from the output.
 On input files which are not tapes or pipes, the file offset

==== //depot/projects/hammer/bin/dd/dd.c#6 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.42 2004/04/06 20:06:46 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -80,6 +80,7 @@
 size_t	cbsz;			/* conversion block size */
 uintmax_t files_cnt = 1;	/* # of files to copy */
 const	u_char *ctab;		/* conversion table */
+char	fill_char;		/* Character to fill with if defined */
 
 int
 main(int argc __unused, char *argv[])
@@ -287,7 +288,9 @@
 		 * use spaces.
 		 */
 		if (ddflags & C_SYNC) {
-			if (ddflags & (C_BLOCK | C_UNBLOCK))
+			if (ddflags & C_FILL)
+				memset(in.dbp, fill_char, in.dbsz);
+			else if (ddflags & (C_BLOCK | C_UNBLOCK))
 				memset(in.dbp, ' ', in.dbsz);
 			else
 				memset(in.dbp, 0, in.dbsz);
@@ -382,7 +385,9 @@
 	else if (cfunc == unblock)
 		unblock_close();
 	if (ddflags & C_OSYNC && out.dbcnt && out.dbcnt < out.dbsz) {
-		if (ddflags & (C_BLOCK | C_UNBLOCK))
+		if (ddflags & C_FILL)
+			memset(out.dbp, fill_char, out.dbsz - out.dbcnt);
+		else if (ddflags & (C_BLOCK | C_UNBLOCK))
 			memset(out.dbp, ' ', out.dbsz - out.dbcnt);
 		else
 			memset(out.dbp, 0, out.dbsz - out.dbcnt);

==== //depot/projects/hammer/bin/dd/dd.h#6 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/dd/dd.h,v 1.21 2004/04/06 20:06:46 markm Exp $
+ * $FreeBSD: src/bin/dd/dd.h,v 1.22 2004/08/15 19:10:05 rwatson Exp $
  */
 
 /* Input/output stream state. */
@@ -94,5 +94,6 @@
 #define	C_SYNC		0x8000000
 #define	C_UCASE		0x10000000
 #define	C_UNBLOCK	0x20000000
+#define	C_FILL		0x40000000
 
 #define	C_PARITY	(C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET)

==== //depot/projects/hammer/bin/dd/extern.h#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/dd/extern.h,v 1.14 2004/04/06 20:06:46 markm Exp $
+ * $FreeBSD: src/bin/dd/extern.h,v 1.15 2004/08/15 19:10:05 rwatson Exp $
  */
 
 void block(void);
@@ -60,3 +60,4 @@
 extern const u_char e2a_32V[], e2a_POSIX[];
 extern const u_char a2ibm_32V[], a2ibm_POSIX[];
 extern u_char casetab[];
+extern char fill_char;

==== //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#6 (text+ko) ====

@@ -1,7 +1,7 @@
 # ex:ts=8
-$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.21 2004/06/26 23:19:40 mbr Exp $
+$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.23 2004/08/16 21:31:34 mbr Exp $
 
-ISC DHCP client 3.0.1rc14
+ISC DHCP client 3.0.1
 	originals can be found at: ftp://ftp.isc.org/isc/dhcp/
 
 
@@ -27,8 +27,8 @@
 
 Imported by:
 
-	cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \
-		src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14
+	cvs import -m 'Import ISC DHCP 3.0.1 client.' \
+		src/contrib/isc-dhcp ISC isc_dhcp_3_0_1
 
 
 To make local changes to isc-dhcp, simply patch and commit to the main
@@ -46,6 +46,8 @@
 	  r1.6 - document -D option.
           - remove dhcpd from SEE ALSO section.
 	client/dhclient.c
+	  r1.42 - FPE fix
+	  r1.41 - interface polling
 	  r1.35 - interface polling
 	  r1.32 - interface polling
 	  r1.31 - interface polling
@@ -65,8 +67,6 @@
 	       - Remove dhcpd from SEE ALSO section.
 	common/dispatch.c
 	  r1.2 - interface polling
-	common/parse.c
-	  r1.2 - 64bit time_t fix
 	includes/dhcpd.h
 	  r1.5 - interface polling
 	  r1.4 - interface polling

==== //depot/projects/hammer/contrib/isc-dhcp/README#6 (text+ko) ====

@@ -1,6 +1,6 @@
 	       Internet Systems Consortium DHCP Distribution
-			   Version 3.0.1rc14
-			     June 09, 2004
+			     Version 3.0.1
+			     July 14, 2004
 
 			      README FILE
 
@@ -96,8 +96,7 @@
 
 			    RELEASE STATUS
 
-This is fourteenth release candidate of version 3.0.1 of the ISC DHCP
-Distribution.  
+This is release version 3.0.1 of the ISC DHCP Distribution.  
 
 In this release, the server and relay agent are currently fully
 functional on NetBSD, Linux systems with kernel version 2.2 or later,
@@ -140,17 +139,17 @@
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	zcat dhcp-3.0.1rc14.tar.gz |tar xvf -
+	zcat dhcp-3.0.1.tar.gz |tar xvf -
 
 On BSD/OS, you have to type gzcat, not zcat, and you may run into
 similar problems on other operating systems.
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-3.0.1rc14 subdirectory that you've just
-created and configure the source tree by typing:
+Now, cd to the dhcp-3.0.1 subdirectory that you've just created and
+configure the source tree by typing:
 
-		./configure
+	./configure
 
 If the configure utility can figure out what sort of system you're
 running on, it will create a custom Makefile for you for that

==== //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#6 (text+ko) ====

@@ -1,6 +1,6 @@
 	      Internet Systems Consortium DHCP Distribution
-			   Version 3.0.1rc14
-			     June 09, 2004
+			     Version 3.0.1
+			     July 14, 2004
 
 			     Release Notes
 
@@ -43,6 +43,25 @@
 thanks to all of these good people here, both for working on the code
 and for prodding me into improving it.
 
+			Changes since 3.0.1rc14
+
+- The global variable 'cur_time' was centralized and is now uniformly of a
+  type #defined in system-dependent headers.  It had previously been defined
+  in one of many places as a 32-bit value, and this causes mayhem on 64-bit
+  big endian systems.  It probably wasn't too healthy on little endian
+  systems either.
+
+- A printf format string error introduced in rc14 was repaired.
+
+- AIX system-dependent header file was altered to only define NO_SNPRINTF
+  if the condition used to #ifdef in vsnprintf in AIX' header files
+  is false.
+
+- The Alpha/OSF system-dependent header file was altered to define
+  NO_SNPRINTF on OS revisions older than 4.0G.
+
+- omapip/test.c had string.h added to its includes.
+
 			Changes since 3.0.1rc13
 
 ! CAN-2004-0460 - CERT VU#317350: Five stack overflow exploits were closed

==== //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#10 (text+ko) ====

@@ -32,8 +32,8 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.38 2004/07/06 15:15:14 des Exp $\n"
-"$Id: dhclient.c,v 1.129.2.18 2004/06/10 17:59:12 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.42 2004/08/16 21:26:04 mbr Exp $\n"
+"$Id: dhclient.c,v 1.129.2.19 2004/07/10 00:11:16 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1750,9 +1750,20 @@
 	   broadcast the DHCPREQUEST rather than unicasting. */
 	if (client -> state == S_REQUESTING ||
 	    client -> state == S_REBOOTING ||
-	    cur_time > client -> active -> rebind)
+	    cur_time > client -> active -> rebind) {
+#ifdef ENABLE_POLLING_MODE
+		/*
+		 * If our state is S_RENEWING we definitly
+		 * have to go through S_INIT first. This can
+		 * happen only if ENABLE_POLLING_MODE is defined.
+		 */
+		if (client -> state == S_RENEWING) {
+			state_init (client);
+			return;
+		}
+#endif
 		destination.sin_addr = sockaddr_broadcast.sin_addr;
-	else
+	} else
 		memcpy (&destination.sin_addr.s_addr,
 			client -> destination.iabuf,
 			sizeof destination.sin_addr.s_addr);

==== //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#6 (text+ko) ====

@@ -1,3 +1,3 @@
 /* Current version of ISC DHCP Distribution. */
 
-#define DHCP_VERSION	"V3.0.1rc14"
+#define DHCP_VERSION	"V3.0.1"

==== //depot/projects/hammer/contrib/isc-dhcp/omapip/test.c#3 (text+ko) ====

@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <isc-dhcp/result.h>
 #include <sys/time.h>
 #include <omapip/omapip.h>

==== //depot/projects/hammer/contrib/top/commands.c#4 (text+ko) ====

@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD: src/contrib/top/commands.c,v 1.9 2004/07/12 15:22:44 alfred Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.10 2004/08/16 07:51:21 alfred Exp $
  */
 
 /*
@@ -81,7 +81,7 @@
 o       - specify sort order (pri, size, res, cpu, time)\n", stdout);
 	else
 		fputs("\
-o       - specify sort order (read, write, fault, total)\n", stdout);
+o       - specify sort order (vcsw, ivcsw, read, write, fault, total)\n", stdout);
 #endif
 	fputs("\
 r       - renice a process\n\

==== //depot/projects/hammer/contrib/top/top.c#5 (text+ko) ====

@@ -13,7 +13,7 @@
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD: src/contrib/top/top.c,v 1.14 2004/07/12 03:00:50 alfred Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.15 2004/08/16 07:51:21 alfred Exp $
  */
 
 /*
@@ -95,8 +95,7 @@
 char *renice_procs();
 
 #ifdef ORDER
-extern int (*proc_compares[])();
-extern int (*io_compares[])();
+extern int (*compares[])();
 #else
 extern int proc_compare();
 extern int io_compare();
@@ -570,10 +569,7 @@
 	get_system_info(&system_info);
 
 #ifdef ORDER
-	if (displaymode == DISP_CPU)
-		compare = proc_compares[order_index];
-	else
-		compare = io_compares[order_index];
+	compare = compares[order_index];
 #else
 	if (displaymode == DISP_CPU)
 		compare = proc_compare;

==== //depot/projects/hammer/etc/mtree/BSD.include.dist#23 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.87 2004/07/30 23:18:52 pjd Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.88 2004/08/16 06:36:21 pjd Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -92,6 +92,8 @@
         ..
         nop
         ..
+        raid3
+        ..
         stripe
         ..
     ..

==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#25 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.303 2004/04/21 15:28:21 tjr Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.304 2004/08/16 09:31:09 dwmalone Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -51,6 +51,8 @@
             ..
             hr_HR.ISO8859-2
             ..
+            hu_HU.ISO8859-2
+            ..
             ru_RU.KOI8-R
             ..
         ..

==== //depot/projects/hammer/etc/rc.d/jail#8 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/jail,v 1.14 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.15 2004/08/16 16:37:06 nectar Exp $
 #
 
 # PROVIDE: jail
@@ -122,6 +122,8 @@
 	echo '.'
 
 	echo -n 'Starting jails:'
+	_tmp_dir=`mktemp -d /tmp/jail.XXXXXXXX` || \
+	    err 3 "$name: Can't create temp dir, exiting..."
 	for _jail in ${jail_list}
 	do
 		init_variables $_jail
@@ -155,7 +157,7 @@
 				mount -t procfs proc "${jail_procdir}"
 			fi
 		fi
-		_tmp_jail=/tmp/jail.$$
+		_tmp_jail=${_tmp_dir}/jail.$$
 		jail -i ${jail_rootdir} ${jail_hostname} \
 			${jail_ip} ${jail_exec} > ${_tmp_jail} 2>&1
 		[ "$?" -eq 0 ] && echo -n " $jail_hostname"
@@ -164,6 +166,7 @@
 		rm -f ${_tmp_jail}
 		echo ${_jail_id} > /var/run/jail_${_jail}.id
 	done
+	rmdir ${_tmp_dir}
 	echo '.'
 }
 

==== //depot/projects/hammer/etc/services#11 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.101 2004/07/11 19:20:47 cperciva Exp $
+# $FreeBSD: src/etc/services,v 1.102 2004/08/16 11:52:22 cperciva Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -1935,6 +1935,8 @@
 vat-control	3457/udp   #VAT default control
 nut		3493/tcp   #Network UPS Tools
 nut		3493/udp   #Network UPS Tools
+tsp		3653/tcp   #Tunnel Setup Protocol
+tsp		3653/udp   #Tunnel Setup Protocol
 svn		3690/tcp   #Subversion
 svn		3690/udp   #Subversion
 udt_os		3900/tcp   #Unidata UDT OS

==== //depot/projects/hammer/games/fortune/datfiles/fortunes#26 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.140 2004/07/26 21:18:58 des Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.141 2004/08/15 19:24:17 rwatson Exp $
 
 %
 			-- Gifts for Children --
@@ -13269,6 +13269,12 @@
 of zeal, well-meaning but without understanding.
 		-- Justice Louis D. Brandeis
 %
+The hand that feeds the chicken every day finally wrings its neck instead,
+thus proving that more sophisticated views about the uniformity of nature
+would have been useful to the chicken.
+ 
+		-- Bertrand Russell, "On Induction"
+%
 The hardest thing in the world to understand is the income tax.
 		-- Albert Einstein
 %

==== //depot/projects/hammer/include/Makefile#28 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.221 2004/08/12 12:36:04 tjr Exp $
+# $FreeBSD: src/include/Makefile,v 1.222 2004/08/16 06:36:20 pjd Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -38,7 +38,8 @@
 	dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \
 	fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
 	fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \
-	geom/concat geom/gate geom/label geom/mirror geom/nop geom/stripe \
+	geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \
+	geom/stripe \
 	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 \

==== //depot/projects/hammer/lib/libc/alpha/gen/_set_tp.c#2 (text+ko) ====

@@ -23,10 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.1 2004/08/15 16:18:02 dfr Exp $
+ *	$FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.2 2004/08/16 08:12:29 dfr Exp $
  */
 
-#include <stdint.h>
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_set_tp.c,v 1.2 2004/08/16 08:12:29 dfr Exp $");
+
+#include <sys/types.h>
 #include <machine/alpha_cpu.h>
 
 void

==== //depot/projects/hammer/lib/libpthread/Makefile#15 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.51 2004/01/31 05:05:45 marcel Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.52 2004/08/16 03:27:28 davidxu Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -19,6 +19,7 @@
 CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include
 CFLAGS+=-I${.CURDIR}/sys
 CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
+CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH}
 CFLAGS+=-fno-builtin
 
 # Uncomment this if you want libpthread to contain debug information for

==== //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.5 2004/08/15 16:28:04 dfr Exp $
+ * $FreeBSD: src/lib/libpthread/arch/alpha/include/pthread_md.h,v 1.7 2004/08/16 14:07:38 davidxu Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
@@ -34,6 +34,7 @@
 #include <ucontext.h>
 
 #define	KSE_STACKSIZE		16384
+#define	DTV_OFFSET		offsetof(struct tcb, tcb_tp.tp_tdv)
 
 #define	THR_GETCONTEXT(ucp)	_alpha_save_context(&(ucp)->uc_mcontext)
 #define	THR_SETCONTEXT(ucp)	PANIC("THR_SETCONTEXT() now in use!\n")

==== //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#7 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.8 2004/08/15 16:28:04 dfr Exp $
+ * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.9 2004/08/16 03:27:28 davidxu Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
@@ -32,12 +32,14 @@
 #ifndef _PTHREAD_MD_H_
 #define	_PTHREAD_MD_H_
 
+#include <stddef.h>
 #include <sys/types.h>
 #include <sys/kse.h>
 #include <machine/sysarch.h>
 #include <ucontext.h>
 
 #define	KSE_STACKSIZE		16384
+#define	DTV_OFFSET		offsetof(struct tcb, tcb_dtv)
 
 #define	THR_GETCONTEXT(ucp)	\
 	(void)_amd64_save_context(&(ucp)->uc_mcontext)

==== //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.3 2004/07/14 00:58:53 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.5 2004/08/16 14:07:38 davidxu Exp $
  */
 
 /*
@@ -38,6 +38,7 @@
 #include <ucontext.h>
 
 #define	KSE_STACKSIZE		16384
+#define	DTV_OFFSET              offsetof(struct tcb, tcb_tp.tp_tdv)
 
 int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *);
 int _thr_getcontext(mcontext_t *);

==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.9 2004/08/15 16:28:05 dfr Exp $
+ * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.10 2004/08/16 03:27:29 davidxu Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
@@ -31,6 +31,7 @@
 #ifndef _PTHREAD_MD_H_
 #define	_PTHREAD_MD_H_
 
+#include <stddef.h>
 #include <sys/kse.h>
 #include <ucontext.h>
 
@@ -38,6 +39,7 @@
 extern int _thr_getcontext(mcontext_t *);
 
 #define	KSE_STACKSIZE		16384
+#define	DTV_OFFSET		offsetof(struct tcb, tcb_dtv)
 
 #define	THR_GETCONTEXT(ucp)	_thr_getcontext(&(ucp)->uc_mcontext)
 #define	THR_SETCONTEXT(ucp)	_thr_setcontext(&(ucp)->uc_mcontext, 0, NULL)

==== //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.14 2004/08/15 16:28:05 dfr Exp $

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

More information about the p4-projects mailing list