Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Apr 2003 17:42:01 -0700 (PDT)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 29033 for review
Message-ID:  <200304160042.h3G0g1WE071642@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=29033

Change 29033 by marcel@marcel_pluto1 on 2003/04/15 17:41:19

	IFia64

Affected files ...

.. //depot/projects/ia64_epc/Makefile.inc1#9 integrate
.. //depot/projects/ia64_epc/bin/cp/cp.c#3 integrate
.. //depot/projects/ia64_epc/bin/ps/keyword.c#2 integrate
.. //depot/projects/ia64_epc/bin/ps/print.c#2 integrate
.. //depot/projects/ia64_epc/bin/ps/ps.h#2 integrate
.. //depot/projects/ia64_epc/contrib/gcc/config/i386/freebsd.h#2 integrate
.. //depot/projects/ia64_epc/contrib/smbfs/lib/smb/ctx.c#2 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/addr2line/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/ar/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/Makefile.inc0#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/ld/Makefile#4 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/nm/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/objcopy/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/objdump/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/readelf/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/size/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/strings/Makefile#3 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/strip/Makefile#3 integrate
.. //depot/projects/ia64_epc/lib/libc/stdio/vfprintf.c#4 integrate
.. //depot/projects/ia64_epc/lib/libc/stdio/vfwprintf.c#5 integrate
.. //depot/projects/ia64_epc/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/ia64_epc/lib/libc/sys/ntp_adjtime.2#1 branch
.. //depot/projects/ia64_epc/lib/libstand/zalloc_defs.h#2 integrate
.. //depot/projects/ia64_epc/release/Makefile#6 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate
.. //depot/projects/ia64_epc/release/scripts/doFS.sh#5 integrate
.. //depot/projects/ia64_epc/sbin/fdisk/Makefile#2 integrate
.. //depot/projects/ia64_epc/sbin/fdisk/fdisk.c#3 integrate
.. //depot/projects/ia64_epc/sbin/fdisk/runtest.sh#1 branch
.. //depot/projects/ia64_epc/sbin/gbde/gbde.c#4 integrate
.. //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/ia64_epc/sbin/ping/ping.c#7 integrate
.. //depot/projects/ia64_epc/secure/lib/libcrypto/Makefile#4 integrate
.. //depot/projects/ia64_epc/share/man/man4/Makefile#6 integrate
.. //depot/projects/ia64_epc/share/man/man4/fxp.4#3 integrate
.. //depot/projects/ia64_epc/share/man/man4/man4.i386/Makefile#5 integrate
.. //depot/projects/ia64_epc/share/man/man4/man4.i386/sbni.4#1 branch
.. //depot/projects/ia64_epc/share/man/man4/sbsh.4#1 branch
.. //depot/projects/ia64_epc/share/man/man4/xl.4#3 integrate
.. //depot/projects/ia64_epc/share/man/man5/rc.conf.5#7 integrate
.. //depot/projects/ia64_epc/share/man/man7/environ.7#2 integrate
.. //depot/projects/ia64_epc/share/man/man9/mbuf.9#3 integrate
.. //depot/projects/ia64_epc/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/ia64_epc/sys/alpha/conf/NOTES#3 integrate
.. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#6 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.alpha#3 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.i386#3 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.ia64#3 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.pc98#3 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.powerpc#3 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.sparc64#4 integrate
.. //depot/projects/ia64_epc/sys/conf/Makefile.x86_64#3 integrate
.. //depot/projects/ia64_epc/sys/conf/NOTES#9 integrate
.. //depot/projects/ia64_epc/sys/conf/files#9 integrate
.. //depot/projects/ia64_epc/sys/conf/files.i386#6 integrate
.. //depot/projects/ia64_epc/sys/conf/files.ia64#7 integrate
.. //depot/projects/ia64_epc/sys/conf/options#7 integrate
.. //depot/projects/ia64_epc/sys/conf/options.i386#6 integrate
.. //depot/projects/ia64_epc/sys/conf/options.ia64#2 integrate
.. //depot/projects/ia64_epc/sys/conf/options.pc98#4 integrate
.. //depot/projects/ia64_epc/sys/conf/options.powerpc#2 integrate
.. //depot/projects/ia64_epc/sys/conf/options.x86_64#2 integrate
.. //depot/projects/ia64_epc/sys/dev/an/if_an_isa.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/an/if_an_pccard.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/an/if_an_pci.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/ar/if_ar_isa.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/ar/if_ar_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/ccd/ccd.c#7 integrate
.. //depot/projects/ia64_epc/sys/dev/cm/if_cm_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/cs/if_cs_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/cs/if_cs_pccard.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/ed/if_ed_cbus.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/ed/if_ed_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/ed/if_ed_pccard.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/ed/if_ed_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/if_fwe.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#7 integrate
.. //depot/projects/ia64_epc/sys/dev/fxp/if_fxp.c#9 integrate
.. //depot/projects/ia64_epc/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/gx/if_gx.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/lge/if_lge.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/lnc/if_lnc_cbus.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/lnc/if_lnc_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/lnc/if_lnc_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/pdq/if_fea.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/pdq/if_fpa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/sbni/if_sbni_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/sbni/if_sbni_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/sbsh/if_sbsh.c#1 branch
.. //depot/projects/ia64_epc/sys/dev/sbsh/if_sbshreg.h#1 branch
.. //depot/projects/ia64_epc/sys/dev/sn/if_sn_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/sn/if_sn_pccard.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/snc/if_snc_cbus.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/snc/if_snc_pccard.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/sr/if_sr_isa.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/sr/if_sr_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/tx/if_tx.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/usb/FILES#2 integrate
.. //depot/projects/ia64_epc/sys/dev/usb/ehci.c#1 branch
.. //depot/projects/ia64_epc/sys/dev/usb/ehci_pci.c#1 branch
.. //depot/projects/ia64_epc/sys/dev/usb/ehcireg.h#1 branch
.. //depot/projects/ia64_epc/sys/dev/usb/ehcivar.h#1 branch
.. //depot/projects/ia64_epc/sys/dev/usb/if_aue.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/usb/if_cue.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/usb/if_kue.c#5 integrate
.. //depot/projects/ia64_epc/sys/dev/usb/umass.c#6 integrate
.. //depot/projects/ia64_epc/sys/dev/usb/usb.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/dev/wi/if_wi_pccard.c#7 integrate
.. //depot/projects/ia64_epc/sys/dev/wi/if_wi_pci.c#3 integrate
.. //depot/projects/ia64_epc/sys/geom/geom.h#5 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_aes.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_apple.c#5 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_bsd.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_dump.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_event.c#6 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_gpt.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_io.c#6 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_mbr.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_mbr_enc.c#1 branch
.. //depot/projects/ia64_epc/sys/geom/geom_mirror.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_pc98.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_slice.c#5 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_slice.h#2 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_subr.c#6 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_sunlabel.c#4 integrate
.. //depot/projects/ia64_epc/sys/geom/geom_vol_ffs.c#3 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/busdma_machdep.c#7 integrate
.. //depot/projects/ia64_epc/sys/i386/linux/linux_ptrace.c#3 integrate
.. //depot/projects/ia64_epc/sys/isa/isa_common.c#2 integrate
.. //depot/projects/ia64_epc/sys/kern/init_main.c#5 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_conf.c#5 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_mac.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/sched_ule.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/subr_mbuf.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/ia64_epc/sys/kern/uipc_mbuf.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/uipc_mbuf2.c#3 integrate
.. //depot/projects/ia64_epc/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/ia64_epc/sys/modules/Makefile#8 integrate
.. //depot/projects/ia64_epc/sys/modules/sbsh/Makefile#1 branch
.. //depot/projects/ia64_epc/sys/modules/usb/Makefile#2 integrate
.. //depot/projects/ia64_epc/sys/net/if_loop.c#5 integrate
.. //depot/projects/ia64_epc/sys/net/route.c#4 integrate
.. //depot/projects/ia64_epc/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/ia64_epc/sys/pci/agp_ali.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/agp_amd.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/agp_i810.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/agp_intel.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/agp_sis.c#3 integrate
.. //depot/projects/ia64_epc/sys/pci/agp_via.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/alpm.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/amdpm.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/cy_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/if_dc.c#5 integrate
.. //depot/projects/ia64_epc/sys/pci/if_de.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_en_pci.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/if_pcn.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_rl.c#6 integrate
.. //depot/projects/ia64_epc/sys/pci/if_sf.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_sis.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_sk.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_ste.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_ti.c#5 integrate
.. //depot/projects/ia64_epc/sys/pci/if_tl.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_vr.c#5 integrate
.. //depot/projects/ia64_epc/sys/pci/if_wb.c#4 integrate
.. //depot/projects/ia64_epc/sys/pci/if_xl.c#9 integrate
.. //depot/projects/ia64_epc/sys/pci/ncr.c#3 integrate
.. //depot/projects/ia64_epc/sys/pci/viapm.c#2 integrate
.. //depot/projects/ia64_epc/sys/pci/xrpu.c#5 integrate
.. //depot/projects/ia64_epc/sys/security/mac_biba/mac_biba.c#4 integrate
.. //depot/projects/ia64_epc/sys/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/ia64_epc/sys/security/mac_mls/mac_mls.c#4 integrate
.. //depot/projects/ia64_epc/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/include/pmap.h#5 integrate
.. //depot/projects/ia64_epc/sys/sparc64/include/tlb.h#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/cache.c#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/cheetah.c#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#7 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/pmap.c#7 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/spitfire.c#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/swtch.S#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/tlb.c#2 integrate
.. //depot/projects/ia64_epc/sys/sys/bio.h#3 integrate
.. //depot/projects/ia64_epc/sys/sys/diskmbr.h#3 integrate
.. //depot/projects/ia64_epc/sys/sys/mac.h#4 integrate
.. //depot/projects/ia64_epc/sys/sys/mac_policy.h#4 integrate
.. //depot/projects/ia64_epc/sys/sys/mbuf.h#7 integrate
.. //depot/projects/ia64_epc/sys/sys/proc.h#7 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_map.c#5 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_object.c#6 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_object.h#4 integrate
.. //depot/projects/ia64_epc/tools/build/Makefile#3 integrate
.. //depot/projects/ia64_epc/tools/build/Makefile.boot#2 delete
.. //depot/projects/ia64_epc/tools/build/mk/Makefile.boot#1 branch
.. //depot/projects/ia64_epc/tools/build/mk/bsd.lib.mk#1 branch
.. //depot/projects/ia64_epc/tools/build/mk/bsd.prog.mk#1 branch
.. //depot/projects/ia64_epc/tools/regression/geom/GLib/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/RunTest.sh#2 integrate
.. //depot/projects/ia64_epc/tools/regression/geom/Test/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/Makefile.inc#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T000/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T000/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T000/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T001/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T001/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T001/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T002/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T002/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T002/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T003/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T003/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T003/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T004/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T004/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T004/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T005/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T005/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T005/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T006/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T006/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T006/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T007/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T007/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T007/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T008/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T008/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T008/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T009/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T009/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T009/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T010/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T010/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T010/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T011/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T011/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T011/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T012/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T012/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T012/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T013/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T013/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T013/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T014/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T014/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T014/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T015/Makefile#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T015/ref.conf#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/Test/T015/testprg.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_kernsim.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_sim.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_sim.h#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_simdev.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_simdisk.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_simdisk.h#2 delete
.. //depot/projects/ia64_epc/tools/regression/geom/geom_simdisk_xml.c#2 delete
.. //depot/projects/ia64_epc/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/ia64_epc/usr.bin/make/main.c#3 integrate
.. //depot/projects/ia64_epc/usr.bin/truss/syscalls.c#2 integrate
.. //depot/projects/ia64_epc/usr.bin/vmstat/vmstat.8#2 integrate
.. //depot/projects/ia64_epc/usr.bin/vmstat/vmstat.c#5 integrate
.. //depot/projects/ia64_epc/usr.bin/window/wwprintf.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/acpi/acpidump/acpi.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/boot0cfg/boot0cfg.8#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/config/configvers.h#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/config/mkmakefile.c#3 integrate
.. //depot/projects/ia64_epc/usr.sbin/i4b/isdntest/Makefile#2 integrate

Differences ...

==== //depot/projects/ia64_epc/Makefile.inc1#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.340 2003/04/11 17:58:17 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.348 2003/04/14 14:46:13 ru Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS5 to build Kerberos5
@@ -151,7 +151,9 @@
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
 # /usr/games added for fortune which depend on strfile
-STRICTTMPPATH=	${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
 INSTALLTMP!=	/usr/bin/mktemp -d -u -t install
@@ -181,21 +183,23 @@
 #	This stage installs a previously built world.
 #
 
+BOOTSTRAPPING?=	0
+
 # Common environment for world related stages
 CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		CPUTYPE=${TARGET_CPUTYPE} \
-		GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
-		GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
-		GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac
+		GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
+		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
+		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
 
 # bootstrap-tools stage
 BMAKEENV=	DESTDIR= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
-		__MAKE_CONF=${.CURDIR}/tools/build/Makefile.boot \
-		OLD_MAKE_CONF=${__MAKE_CONF} \
-		WORLDTMP=${WORLDTMP}
+		PATH=${BPATH}:${PATH} \
+		WORLDTMP=${WORLDTMP} \
+		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		BOOTSTRAPPING=${OSRELDATE} \
@@ -225,28 +229,6 @@
 # kernel stage
 KMAKEENV=	${WMAKEENV}
 
-USRDIRS=	usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
-		usr/libexec usr/sbin usr/share/misc \
-		usr/share/dict \
-		usr/share/groff_font/devX100 \
-		usr/share/groff_font/devX100-12 \
-		usr/share/groff_font/devX75 \
-		usr/share/groff_font/devX75-12 \
-		usr/share/groff_font/devascii \
-		usr/share/groff_font/devcp1047 \
-		usr/share/groff_font/devdvi \
-		usr/share/groff_font/devhtml \
-		usr/share/groff_font/devkoi8-r \
-		usr/share/groff_font/devlatin1 \
-		usr/share/groff_font/devlbp \
-		usr/share/groff_font/devlj4 \
-		usr/share/groff_font/devps \
-		usr/share/groff_font/devutf8 \
-		usr/share/tmac/mdoc usr/share/tmac/mm
-
-INCDIRS=	arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \
-		objc openssl protocols readline rpc rpcsvc security ufs
-
 #
 # buildworld
 #
@@ -274,16 +256,36 @@
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
-.for _dir in ${USRDIRS}
+.for _dir in \
+    usr/bin usr/games usr/include/sys usr/lib \
+    usr/libexec usr/sbin usr/share/dict \
+    usr/share/groff_font/devX100 \
+    usr/share/groff_font/devX100-12 \
+    usr/share/groff_font/devX75 \
+    usr/share/groff_font/devX75-12 \
+    usr/share/groff_font/devascii \
+    usr/share/groff_font/devcp1047 \
+    usr/share/groff_font/devdvi \
+    usr/share/groff_font/devhtml \
+    usr/share/groff_font/devkoi8-r \
+    usr/share/groff_font/devlatin1 \
+    usr/share/groff_font/devlbp \
+    usr/share/groff_font/devlj4 \
+    usr/share/groff_font/devps \
+    usr/share/groff_font/devutf8 \
+    usr/share/tmac/mdoc usr/share/tmac/mm
+	mkdir -p ${WORLDTMP}/legacy/${_dir}
+.endfor
+.for _dir in \
+    usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
-.for _dir in ${INCDIRS}
+.for _dir in \
+    arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \
+    objc openssl protocols readline rpc rpcsvc security ufs
 	mkdir -p ${WORLDTMP}/usr/include/${_dir}
 .endfor
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.for _dir in lib include/sys
-	mkdir -p ${WORLDTMP}/legacy/usr/${_dir}
-.endfor
 _legacy:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -638,18 +640,37 @@
 _strfile=	games/fortune/strfile
 .endif
 
+.if ( ${BOOTSTRAPPING} < 450005 || \
+    ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 ))
+_uudecode=	usr.bin/uudecode
+.endif
+
+.if ( ${BOOTSTRAPPING} < 430002 || \
+    ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500019 ))
+_xargs=		usr.bin/xargs
+.endif
+
+.if ( ${BOOTSTRAPPING} < 430002 || \
+    ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500018 ))
+_yacc=		usr.bin/yacc
+.endif
+
+.if ${BOOTSTRAPPING} < 500019
+_kbdcontrol=	usr.sbin/kbdcontrol
+.endif
+
 bootstrap-tools:
-.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \
-    usr.bin/makewhatis usr.bin/rpcgen usr.bin/uudecode \
-    usr.bin/xargs usr.bin/xinstall \
-    usr.sbin/config usr.sbin/kbdcontrol \
+.for _tool in ${_strfile} usr.bin/colldef \
+    usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
+    ${_xargs} usr.bin/xinstall ${_yacc} \
+    usr.sbin/config ${_kbdcontrol} \
     gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo
 	@${ECHODIR} "===> ${_tool}"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
 		${MAKE} DIRPRFX=${_tool}/ depend; \
 		${MAKE} DIRPRFX=${_tool}/ all; \
-		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
 #
@@ -697,7 +718,8 @@
 .endif
 .endif
 
-.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
+    ${BOOTSTRAPPING} < 500037
 _elf2aout=	usr.bin/elf2aout
 .endif
 

==== //depot/projects/ia64_epc/bin/cp/cp.c#3 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.45 2003/04/07 12:09:17 mdodd Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.47 2003/04/13 08:47:30 bde Exp $");
 
 /*
  * Cp copies source files to target files.
@@ -63,13 +63,14 @@
  * in "to") to form the final target path.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
 #include <limits.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -88,14 +89,13 @@
 
 int fflag, iflag, nflag, pflag, vflag;
 static int Rflag, rflag;
-
 volatile sig_atomic_t info;
-static void siginfo (int notused __unused);
 
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
 
 static int copy(char *[], enum op, int);
 static int mastercmp(const FTSENT * const *, const FTSENT * const *);
+static void siginfo(int __unused);
 
 int
 main(int argc, char *argv[])
@@ -507,7 +507,7 @@
 }
 
 static void
-siginfo (int notused __unused)
+siginfo(int sig __unused)
 {
 
 	info = 1;

==== //depot/projects/ia64_epc/bin/ps/keyword.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.62 2003/02/05 19:22:39 sobomax Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.63 2003/04/12 10:39:56 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -143,7 +143,7 @@
 	{"ppid", "PPID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_ppid), UINT,
 		PIDFMT, 0},
 	{"pri", "PRI", NULL, 0, pri, NULL, 3, 0, CHAR, NULL, 0},
-	{"re", "RE", NULL, 0, kvar, NULL, 3, KOFF(ki_swtime), UINT, "d",
+	{"re", "RE", NULL, INF127, kvar, NULL, 3, KOFF(ki_swtime), UINT, "d",
 		0},
 	{"rgid", "RGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_rgid),
 		UINT, UIDFMT, 0},
@@ -166,7 +166,7 @@
 		UINT, "x", 0},
 	{"sigmask", "BLOCKED", NULL, 0, kvar, NULL, 8, KOFF(ki_sigmask),
 		UINT, "x", 0},
-	{"sl", "SL", NULL, 0, kvar, NULL, 3, KOFF(ki_slptime), UINT, "d",
+	{"sl", "SL", NULL, INF127, kvar, NULL, 3, KOFF(ki_slptime), UINT, "d",
 		0},
 	{"start", "STARTED", NULL, LJUST|USER, started, NULL, 7, 0, CHAR, NULL,
 		0},

==== //depot/projects/ia64_epc/bin/ps/print.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.79 2003/02/05 13:18:17 charnier Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.82 2003/04/15 18:49:20 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -106,11 +106,9 @@
 	char *cp, *vis_args;
 
 	v = ve->var;
-
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
-
 	if (ve->next == NULL) {
 		/* last field */
 		if (termwidth == UNLIMITED) {
@@ -136,7 +134,6 @@
 	char *cp, *vis_env, *vis_args;
 
 	v = ve->var;
-
 	if (cflag) {
 		if (ve->next == NULL)	/* last field, don't pad */
 			(void)printf("%s", k->ki_p->ki_comm);
@@ -144,7 +141,6 @@
 			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 		return;
 	}
-
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
@@ -294,7 +290,7 @@
 int
 s_uname(KINFO *k)
 {
-	    return (strlen(user_from_uid(k->ki_p->ki_uid, 0)));
+	return (strlen(user_from_uid(k->ki_p->ki_uid, 0)));
 }
 
 void
@@ -324,7 +320,7 @@
 int
 s_runame(KINFO *k)
 {
-	    return (strlen(user_from_uid(k->ki_p->ki_ruid, 0)));
+	return (strlen(user_from_uid(k->ki_p->ki_ruid, 0)));
 }
 
 
@@ -356,13 +352,13 @@
 	v = ve->var;
 	dev = k->ki_p->ki_tdev;
 	if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL)
-		(void)printf("%*s ", v->width-1, "??");
+		(void)printf("%*s ", v->width - 1, "??");
 	else {
 		if (strncmp(ttname, "tty", 3) == 0 ||
 		    strncmp(ttname, "cua", 3) == 0)
 			ttname += 3;
-		(void)printf("%*.*s%c", v->width-1, v->width-1, ttname,
-			k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-');
+		(void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname,
+		    k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-');
 	}
 }
 
@@ -387,28 +383,26 @@
 	VAR *v;
 	time_t then;
 	struct tm *tp;
+	static int use_ampm = -1;
 	char buf[100];
-	static int  use_ampm = -1;
 
 	v = ve->var;
 	if (!k->ki_valid) {
 		(void)printf("%-*s", v->width, "-");
 		return;
 	}
-
 	if (use_ampm < 0)
 		use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0');
-
 	then = k->ki_p->ki_start.tv_sec;
 	tp = localtime(&then);
 	if (now - k->ki_p->ki_start.tv_sec < 24 * 3600) {
-		(void)strftime(buf, sizeof(buf) - 1,
-		use_ampm ? "%l:%M%p" : "%k:%M  ", tp);
+		(void)strftime(buf, sizeof(buf),
+		    use_ampm ? "%l:%M%p" : "%k:%M  ", tp);
 	} else if (now - k->ki_p->ki_start.tv_sec < 7 * 86400) {
-		(void)strftime(buf, sizeof(buf) - 1,
-		use_ampm ? "%a%I%p" : "%a%H  ", tp);
+		(void)strftime(buf, sizeof(buf),
+		    use_ampm ? "%a%I%p" : "%a%H  ", tp);
 	} else
-		(void)strftime(buf, sizeof(buf) - 1, "%e%b%y", tp);
+		(void)strftime(buf, sizeof(buf), "%e%b%y", tp);
 	(void)printf("%-*s", v->width, buf);
 }
 
@@ -425,7 +419,7 @@
 		return;
 	}
 	then = k->ki_p->ki_start.tv_sec;
-	(void)strftime(buf, sizeof(buf) -1, "%c", localtime(&then));
+	(void)strftime(buf, sizeof(buf), "%c", localtime(&then));
 	(void)printf("%-*s", v->width, buf);
 }
 
@@ -438,7 +432,7 @@
 	if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) {
 		if (k->ki_p->ki_lockname[0] != 0)
 			(void)printf("%-*.*s", v->width, v->width,
-				      k->ki_p->ki_lockname);
+			    k->ki_p->ki_lockname);
 		else
 			(void)printf("%-*s", v->width, "???");
 	} else
@@ -454,13 +448,12 @@
 	if (k->ki_p->ki_wchan) {
 		if (k->ki_p->ki_wmesg[0] != 0)
 			(void)printf("%-*.*s", v->width, v->width,
-				      k->ki_p->ki_wmesg);
+			    k->ki_p->ki_wmesg);
 		else
 			(void)printf("%-*lx", v->width,
 			    (long)k->ki_p->ki_wchan);
-	} else {
+	} else
 		(void)printf("%-*s", v->width, "-");
-	}
 }
 
 void
@@ -472,7 +465,7 @@
 	if (k->ki_p->ki_wchan) {
 		if (k->ki_p->ki_wmesg[0] != 0)
 			(void)printf("%-*.*s", v->width, v->width,
-				      k->ki_p->ki_wmesg);
+			    k->ki_p->ki_wmesg);
 		else
 			(void)printf("%-*lx", v->width,
 			    (long)k->ki_p->ki_wchan);
@@ -480,12 +473,10 @@
 		if (k->ki_p->ki_lockname[0]) {
 			(void)printf("%-*.*s", v->width, v->width,
 			    k->ki_p->ki_lockname);
-		} else {
+		} else
 			(void)printf("%-*s", v->width, "???");
-		}
-	} else {
+	} else
 		(void)printf("%-*s", v->width, "-");
-	}
 }
 
 void
@@ -504,9 +495,9 @@
 	long secs;
 	long psecs;	/* "parts" of a second. first micro, then centi */
 	char obuff[128];
-	static char decimal_point = 0;
+	static char decimal_point;
 
-	if (!decimal_point)
+	if (decimal_point == '\0')
 		decimal_point = localeconv()->decimal_point[0];
 	v = ve->var;
 	if (k->ki_p->ki_stat == SZOMB || !k->ki_valid) {
@@ -531,8 +522,8 @@
 		secs += psecs / 100;
 		psecs = psecs % 100;
 	}
-	(void)snprintf(obuff, sizeof(obuff),
-	    "%3ld:%02ld%c%02ld", secs/60, secs%60, decimal_point, psecs);
+	(void)snprintf(obuff, sizeof(obuff), "%3ld:%02ld%c%02ld",
+	    secs / 60, secs % 60, decimal_point, psecs);
 	(void)printf("%*s", v->width, obuff);
 }
 
@@ -540,30 +531,26 @@
 elapsed(KINFO *k, VARENT *ve)
 {
 	VAR *v;
-	time_t days, hours, mins, secs;
+	time_t val;
+	int days, hours, mins, secs;
 	char obuff[128];
 
 	v = ve->var;
-
-	secs = now - k->ki_p->ki_start.tv_sec;
-	days = secs/(24*60*60);
-	secs %= (24*60*60);
-	hours = secs/(60*60);
-	secs %= (60*60);
-	mins = secs/60;
-	secs %= 60;
-	if (days != 0) {
-		(void)snprintf(obuff, sizeof(obuff), "%3ld-%02ld:%02ld:%02ld",
-			(long)days, (long)hours, (long)mins, (long)secs);
-	}
-	else if (hours != 0) {
-		(void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld:%02ld",
-			            (long)hours, (long)mins, (long)secs);
-	}
-	else {
-		(void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld",
-			                         (long)mins, (long)secs);
-	}
+	val = now - k->ki_p->ki_start.tv_sec;
+	days = val / (24 * 60 * 60);
+	val %= 24 * 60 * 60;
+	hours = val / (60 * 60);
+	val %= 60 * 60;
+	mins = val / 60;
+	secs = val % 60;
+	if (days != 0)
+		(void)snprintf(obuff, sizeof(obuff), "%3d-%02d:%02d:%02d",
+		    days, hours, mins, secs);
+	else if (hours != 0)
+		(void)snprintf(obuff, sizeof(obuff), "%02d:%02d:%02d",
+		    hours, mins, secs);
+	else
+		(void)snprintf(obuff, sizeof(obuff), "%02d:%02d", mins, secs);
 	(void)printf("%*s", v->width, obuff);
 }
 
@@ -612,7 +599,7 @@
 		return (0.0);
 	/* XXX want pmap ptpages, segtab, etc. (per architecture) */
 	/* XXX don't have info about shared */
-	fracmem = ((float)k->ki_p->ki_rssize)/mempages;
+	fracmem = ((float)k->ki_p->ki_rssize) / mempages;
 	return (100.0 * fracmem);
 }
 
@@ -694,6 +681,8 @@
 	*cp++ = '*';
 	while ((*cp++ = *fcp++));
 
+#define	CHKINF127(n)	(((n) > 127) && (v->flag & INF127) ? 127 : (n))
+
 	switch (v->type) {
 	case CHAR:
 		(void)printf(ofmt, v->width, *(char *)bp);
@@ -711,7 +700,7 @@
 		(void)printf(ofmt, v->width, *(int *)bp);
 		break;
 	case UINT:
-		(void)printf(ofmt, v->width, *(u_int *)bp);
+		(void)printf(ofmt, v->width, CHKINF127(*(u_int *)bp));
 		break;
 	case LONG:
 		(void)printf(ofmt, v->width, *(long *)bp);
@@ -755,25 +744,22 @@
 label(KINFO *k, VARENT *ve)
 {
 	char *string;
+	VAR *v;
 	mac_t proclabel;
 	int error;
-	VAR *v;
 
 	v = ve->var;
 	string = NULL;
-
 	if (mac_prepare_process_label(&proclabel) == -1) {
 		perror("mac_prepare_process_label");
 		goto out;
 	}
-
 	error = mac_get_pid(k->ki_p->ki_pid, proclabel);
 	if (error == 0) {
 		if (mac_to_text(proclabel, &string) == -1)
 			string = NULL;
 	}
 	mac_free(proclabel);
-
 out:
 	if (string != NULL) {
 		(void)printf("%-*s", v->width, string);

==== //depot/projects/ia64_epc/bin/ps/ps.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ps/ps.h,v 1.15 2003/01/19 00:31:16 jmallett Exp $
+ * $FreeBSD: src/bin/ps/ps.h,v 1.16 2003/04/12 10:39:56 tjr Exp $
  */
 
 #define	UNLIMITED	0	/* unlimited terminal width */
@@ -59,6 +59,7 @@
 #define	LJUST	0x02		/* left adjust on output (trailing blanks) */
 #define	USER	0x04		/* needs user structure */
 #define	DSIZ	0x08		/* field size is dynamic*/
+#define	INF127	0x10		/* values >127 displayed as 127 */
 	u_int	flag;
 				/* output routine */
 	void	(*oproc)(struct kinfo *, struct varent *);

==== //depot/projects/ia64_epc/contrib/gcc/config/i386/freebsd.h#2 (text+ko) ====

@@ -22,7 +22,7 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.59 2002/11/26 18:25:20 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.60 2003/04/13 01:04:01 kan Exp $ */
 
 #undef  CC1_SPEC
 #define CC1_SPEC "%(cc1_cpu) %{profile:-p} \
@@ -215,6 +215,27 @@
   } while (0)
 #endif
 
+/* If defined, a C expression whose value is a string containing the
+   assembler operation to identify the following data as
+   uninitialized global data.  If not defined, and neither
+   `ASM_OUTPUT_BSS' nor `ASM_OUTPUT_ALIGNED_BSS' are defined,
+   uninitialized global data will be output in the data section if
+   `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be
+   used.  */
+#undef BSS_SECTION_ASM_OP
+#define BSS_SECTION_ASM_OP "\t.section\t.bss"
+
+/* Like `ASM_OUTPUT_BSS' except takes the required alignment as a
+   separate, explicit argument.  If you define this macro, it is used
+   in place of `ASM_OUTPUT_BSS', and gives you more flexibility in
+   handling the required alignment of the variable.  The alignment is
+   specified as the number of bits.
+
+   Try to use function `asm_output_aligned_bss' defined in file
+   `varasm.c' when defining this macro.  */
+#undef ASM_OUTPUT_ALIGNED_BSS
+#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
+  asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
 
 /************************[  Debugger stuff  ]*********************************/
 

==== //depot/projects/ia64_epc/contrib/smbfs/lib/smb/ctx.c#2 (text+ko) ====

@@ -30,6 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ctx.c,v 1.24 2002/04/13 14:35:28 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/ctx.c,v 1.2 2003/04/12 12:11:14 tjr Exp $
  */
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -408,7 +409,7 @@
 			    &ctx->ct_sh.ioc_group);
 		}
 		if (*p && error == 0) {
-			error = smb_parse_owner(cp, &ctx->ct_ssn.ioc_owner,
+			error = smb_parse_owner(p, &ctx->ct_ssn.ioc_owner,
 			    &ctx->ct_ssn.ioc_group);
 		}
 		free(p);

==== //depot/projects/ia64_epc/gnu/usr.bin/binutils/addr2line/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.8 2003/04/11 18:02:09 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.9 2003/04/12 14:44:48 ru Exp $
 
 .include "../Makefile.inc0"
 
@@ -9,10 +9,9 @@
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>

==== //depot/projects/ia64_epc/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.10 2003/04/11 18:02:09 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.11 2003/04/12 14:44:48 ru Exp $
 
 .include "../Makefile.inc0"
 
@@ -10,10 +10,9 @@
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>

==== //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/Makefile.inc0#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile.inc0,v 1.22 2003/04/11 18:02:09 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile.inc0,v 1.23 2003/04/12 14:44:48 ru Exp $
 
 .include "${.CURDIR}/../../Makefile.inc0"
 
@@ -20,10 +20,9 @@
 CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" 
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 NOSHARED?=	yes
-DPADD:=	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${RELTOP}/libopcodes/libopcodes.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD+=	${RELTOP}/libopcodes/libopcodes.a
 LDADD=	${DPADD}
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU

==== //depot/projects/ia64_epc/gnu/usr.bin/binutils/ld/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.25 2003/04/11 18:02:09 ru Exp $

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



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