PERFORCE change 33959 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue Jul 1 19:35:32 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=33959
Change 33959 by marcel at marcel_nfs on 2003/07/01 19:34:54
IFC @33957
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#69 integrate
.. //depot/projects/ia64/bin/cp/cp.c#14 integrate
.. //depot/projects/ia64/bin/pwd/pwd.c#6 integrate
.. //depot/projects/ia64/contrib/lukemftp/FreeBSD-patchset#2 integrate
.. //depot/projects/ia64/contrib/lukemftp/src/ftp.1#5 integrate
.. //depot/projects/ia64/contrib/lukemftp/src/progressbar.c#2 integrate
.. //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#5 integrate
.. //depot/projects/ia64/etc/periodic/security/510.ipfdenied#2 integrate
.. //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#6 integrate
.. //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#5 integrate
.. //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#6 integrate
.. //depot/projects/ia64/etc/periodic/security/security.functions#3 integrate
.. //depot/projects/ia64/etc/rc.d/initdiskless#8 integrate
.. //depot/projects/ia64/etc/rc.d/ldconfig#7 integrate
.. //depot/projects/ia64/etc/rc.d/motd#6 integrate
.. //depot/projects/ia64/gnu/lib/libg2c/Makefile#4 integrate
.. //depot/projects/ia64/gnu/lib/libgcc/Makefile#17 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#6 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/f77doc/Makefile#3 integrate
.. //depot/projects/ia64/include/unistd.h#18 integrate
.. //depot/projects/ia64/lib/csu/amd64/Makefile#2 integrate
.. //depot/projects/ia64/lib/libc/Makefile#8 integrate
.. //depot/projects/ia64/lib/libc/gen/exec.c#6 integrate
.. //depot/projects/ia64/lib/libc/gen/setproctitle.c#5 integrate
.. //depot/projects/ia64/lib/libc/string/strmode.3#2 integrate
.. //depot/projects/ia64/lib/libc/sys/mount.2#7 integrate
.. //depot/projects/ia64/lib/libc_r/Makefile#4 integrate
.. //depot/projects/ia64/lib/libcompat/Makefile#3 integrate
.. //depot/projects/ia64/lib/libpthread/Makefile#9 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#22 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#14 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#7 integrate
.. //depot/projects/ia64/lib/libstand/Makefile#14 integrate
.. //depot/projects/ia64/lib/libthr/Makefile#4 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#7 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_join.c#8 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#10 integrate
.. //depot/projects/ia64/rescue/rescue/Makefile#3 integrate
.. //depot/projects/ia64/sbin/umount/umount.c#7 integrate
.. //depot/projects/ia64/share/man/man4/uscanner.4#4 integrate
.. //depot/projects/ia64/share/man/man8/diskless.8#9 integrate
.. //depot/projects/ia64/share/man/man9/bus_dma.9#4 integrate
.. //depot/projects/ia64/share/mk/bsd.dep.mk#10 integrate
.. //depot/projects/ia64/share/mk/bsd.lib.mk#22 integrate
.. //depot/projects/ia64/share/mk/sys.mk#9 integrate
.. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#18 integrate
.. //depot/projects/ia64/sys/alpha/include/bus.h#12 integrate
.. //depot/projects/ia64/sys/alpha/isa/isa_dma.c#4 integrate
.. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/ia64/sys/amd64/include/bus_dma.h#6 integrate
.. //depot/projects/ia64/sys/boot/ficl/Makefile#7 integrate
.. //depot/projects/ia64/sys/boot/forth/loader.conf#17 integrate
.. //depot/projects/ia64/sys/boot/i386/btx/lib/Makefile#4 integrate
.. //depot/projects/ia64/sys/boot/pc98/btx/lib/Makefile#4 integrate
.. //depot/projects/ia64/sys/conf/files.sparc64#31 integrate
.. //depot/projects/ia64/sys/conf/options.sparc64#7 integrate
.. //depot/projects/ia64/sys/dev/aac/aac.c#26 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_pci.c#19 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/advansys/adv_eisa.c#4 integrate
.. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#4 integrate
.. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/advansys/advansys.c#7 integrate
.. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/advansys/adwcam.c#7 integrate
.. //depot/projects/ia64/sys/dev/aha/aha.c#9 integrate
.. //depot/projects/ia64/sys/dev/aha/aha_isa.c#4 integrate
.. //depot/projects/ia64/sys/dev/aha/aha_mca.c#4 integrate
.. //depot/projects/ia64/sys/dev/ahb/ahb.c#8 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#11 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#8 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#10 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#11 integrate
.. //depot/projects/ia64/sys/dev/amd/amd.c#6 integrate
.. //depot/projects/ia64/sys/dev/amr/amr_pci.c#10 integrate
.. //depot/projects/ia64/sys/dev/an/if_an_pci.c#10 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-dma.c#25 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt.c#10 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#5 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt_isa.c#4 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt_mca.c#4 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#16 integrate
.. //depot/projects/ia64/sys/dev/ciss/ciss.c#21 integrate
.. //depot/projects/ia64/sys/dev/ct/ct_isa.c#5 integrate
.. //depot/projects/ia64/sys/dev/dpt/dpt_eisa.c#4 integrate
.. //depot/projects/ia64/sys/dev/dpt/dpt_isa.c#4 integrate
.. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#10 integrate
.. //depot/projects/ia64/sys/dev/em/if_em.c#24 integrate
.. //depot/projects/ia64/sys/dev/en/midway.c#17 integrate
.. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.c#32 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwdma.c#2 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwmem.c#13 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci.c#27 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#18 integrate
.. //depot/projects/ia64/sys/dev/firewire/sbp.c#36 integrate
.. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#36 integrate
.. //depot/projects/ia64/sys/dev/gem/if_gem.c#15 integrate
.. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#10 integrate
.. //depot/projects/ia64/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#12 integrate
.. //depot/projects/ia64/sys/dev/hme/if_hme.c#13 integrate
.. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#7 integrate
.. //depot/projects/ia64/sys/dev/ida/ida.c#11 integrate
.. //depot/projects/ia64/sys/dev/ida/ida_eisa.c#5 integrate
.. //depot/projects/ia64/sys/dev/ida/ida_pci.c#5 integrate
.. //depot/projects/ia64/sys/dev/iir/iir.c#7 integrate
.. //depot/projects/ia64/sys/dev/iir/iir_pci.c#7 integrate
.. //depot/projects/ia64/sys/dev/ips/ips.c#3 integrate
.. //depot/projects/ia64/sys/dev/ips/ips_commands.c#3 integrate
.. //depot/projects/ia64/sys/dev/ips/ips_ioctl.c#3 integrate
.. //depot/projects/ia64/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_pci.c#15 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#6 integrate
.. //depot/projects/ia64/sys/dev/lnc/if_lnc_cbus.c#4 integrate
.. //depot/projects/ia64/sys/dev/lnc/if_lnc_isa.c#4 integrate
.. //depot/projects/ia64/sys/dev/lnc/if_lnc_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/mlx/mlx.c#10 integrate
.. //depot/projects/ia64/sys/dev/mlx/mlx_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/mly/mly.c#15 integrate
.. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#8 integrate
.. //depot/projects/ia64/sys/dev/pci/pci.c#25 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_if.m#3 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_private.h#7 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/ess.c#5 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/mss.c#10 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#6 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/sb8.c#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/als4000.c#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/au88x0.c#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/aureal.c#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/cmi.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/cs4281.c#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/ds1.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#11 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/ich.c#14 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/maestro3.c#9 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/solo.c#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/via82c686.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#13 integrate
.. //depot/projects/ia64/sys/dev/trm/trm.c#11 integrate
.. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#16 integrate
.. //depot/projects/ia64/sys/dev/tx/if_tx.c#12 integrate
.. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#18 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#39 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs.h#38 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#38 integrate
.. //depot/projects/ia64/sys/dev/usb/uscanner.c#10 integrate
.. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#13 integrate
.. //depot/projects/ia64/sys/dev/wds/wd7000.c#4 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi.c#42 integrate
.. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#16 integrate
.. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#21 integrate
.. //depot/projects/ia64/sys/i386/include/bus_dma.h#8 integrate
.. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#10 integrate
.. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#15 integrate
.. //depot/projects/ia64/sys/ia64/include/bus.h#13 integrate
.. //depot/projects/ia64/sys/ia64/isa/isa_dma.c#5 integrate
.. //depot/projects/ia64/sys/isa/psm.c#15 integrate
.. //depot/projects/ia64/sys/kern/kern_condvar.c#25 integrate
.. //depot/projects/ia64/sys/kern/kern_intr.c#25 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#55 integrate
.. //depot/projects/ia64/sys/kern/vfs_mount.c#19 integrate
.. //depot/projects/ia64/sys/modules/ath_hal/Makefile#2 integrate
.. //depot/projects/ia64/sys/netipsec/ipsec_output.c#6 integrate
.. //depot/projects/ia64/sys/netipsec/xform_ah.c#4 integrate
.. //depot/projects/ia64/sys/netipsec/xform_esp.c#6 integrate
.. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#4 integrate
.. //depot/projects/ia64/sys/opencrypto/crypto.c#11 integrate
.. //depot/projects/ia64/sys/opencrypto/cryptodev.h#6 integrate
.. //depot/projects/ia64/sys/pci/if_rl.c#34 integrate
.. //depot/projects/ia64/sys/pci/if_sis.c#23 integrate
.. //depot/projects/ia64/sys/pci/if_xl.c#34 integrate
.. //depot/projects/ia64/sys/powerpc/include/bus.h#11 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#15 integrate
.. //depot/projects/ia64/sys/sparc64/conf/GENERIC#36 integrate
.. //depot/projects/ia64/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/ia64/sys/sparc64/ebus/ebus.c#9 integrate
.. //depot/projects/ia64/sys/sparc64/include/bus.h#18 integrate
.. //depot/projects/ia64/sys/sparc64/include/ofw_bus.h#5 integrate
.. //depot/projects/ia64/sys/sparc64/isa/isa.c#8 integrate
.. //depot/projects/ia64/sys/sparc64/isa/ofw_isa.c#4 integrate
.. //depot/projects/ia64/sys/sparc64/isa/ofw_isa.h#2 integrate
.. //depot/projects/ia64/sys/sparc64/pci/apb.c#5 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#12 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.h#6 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib.c#1 branch
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.c#1 branch
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.h#1 branch
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#1 branch
.. //depot/projects/ia64/sys/sparc64/pci/psycho.c#28 integrate
.. //depot/projects/ia64/sys/sparc64/pci/psychovar.h#8 integrate
.. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#17 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#19 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/ofw_bus.c#7 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/sparcbus_if.m#3 delete
.. //depot/projects/ia64/sys/sys/mount.h#21 integrate
.. //depot/projects/ia64/sys/vm/vm_contig.c#14 integrate
.. //depot/projects/ia64/sys/vm/vm_map.c#58 integrate
.. //depot/projects/ia64/sys/vm/vm_page.c#50 integrate
.. //depot/projects/ia64/usr.bin/ee/ee.c#5 integrate
.. //depot/projects/ia64/usr.bin/uname/uname.c#8 integrate
.. //depot/projects/ia64/usr.bin/unifdef/unifdef.c#12 integrate
.. //depot/projects/ia64/usr.bin/units/units.lib#4 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#69 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.369 2003/06/28 04:46:45 smkelly Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.373 2003/07/01 23:10:39 gordon Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -66,6 +66,9 @@
.if exists(${.CURDIR}/libexec)
SUBDIR+= libexec
.endif
+.if exists(${.CURDIR}/rescue) && defined(RESCUE)
+SUBDIR+= rescue
+.endif
.if exists(${.CURDIR}/sbin)
SUBDIR+= sbin
.endif
@@ -664,16 +667,31 @@
_yacc= usr.bin/yacc
.endif
+.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \
+ ${BOOTSTRAPPING} < 501100
+_crunchgen= usr.sbin/crunch/crunchgen
+.endif
+
.if ${BOOTSTRAPPING} < 500019
_kbdcontrol= usr.sbin/kbdcontrol
.endif
bootstrap-tools:
-.for _tool in ${_strfile} usr.bin/colldef \
- usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
- ${_xargs} usr.bin/xinstall ${_yacc} \
- usr.sbin/config ${_kbdcontrol} \
- ${_gperf} ${_groff} gnu/usr.bin/texinfo
+.for _tool in \
+ ${_strfile} \
+ ${_gperf} \
+ ${_groff} \
+ gnu/usr.bin/texinfo \
+ usr.bin/colldef \
+ usr.bin/makewhatis \
+ usr.bin/rpcgen \
+ ${_uudecode} \
+ ${_xargs} \
+ usr.bin/xinstall \
+ ${_yacc} \
+ usr.sbin/config \
+ ${_crunchgen} \
+ ${_kbdcontrol}
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -704,9 +722,18 @@
.endif
build-tools:
-.for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \
- ${_libkrb5} lib/libncurses ${_share} \
- ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall
+.for _tool in \
+ bin/csh \
+ bin/sh \
+ gnu/usr.bin/cc/cc_tools \
+ ${_fortran} \
+ ${_libkrb5} \
+ lib/libncurses \
+ ${_share} \
+ ${_aicasm} \
+ usr.bin/awk \
+ usr.bin/file \
+ usr.sbin/sysinstall
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -716,32 +743,40 @@
#
# cross-tools: Build cross-building tools
#
-.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH}
-_elf2exe= usr.sbin/elf2exe
+.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
+ ${BOOTSTRAPPING} < 500037
+_elf2aout= usr.bin/elf2aout
.endif
.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH}
-_btxld= usr.sbin/btxld
-.if defined(RELEASEDIR)
-_kgzip= usr.sbin/kgzip
+_btxld= usr.sbin/btxld
.endif
+
+.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \
+ defined(RELEASEDIR)) && \
+ ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
+_crunchide= usr.sbin/crunch/crunchide
.endif
-.if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
- ${BOOTSTRAPPING} < 500037
-_elf2aout= usr.bin/elf2aout
+.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH}
+_elf2exe= usr.sbin/elf2exe
.endif
-.if defined(RELEASEDIR)
-_crunchide= usr.sbin/crunch/crunchide
+.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \
+ defined(RELEASEDIR)
+_kgzip= usr.sbin/kgzip
.endif
-_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint
-
cross-tools:
-.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \
- gnu/usr.bin/binutils ${_crunchide} \
- gnu/usr.bin/cc ${_xlint} ${_kgzip}
+.for _tool in \
+ gnu/usr.bin/binutils \
+ gnu/usr.bin/cc \
+ ${_elf2aout} \
+ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
+ ${_btxld} \
+ ${_crunchide} \
+ ${_elf2exe} \
+ ${_kgzip}
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
==== //depot/projects/ia64/bin/cp/cp.c#14 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.49 2003/06/30 06:16:06 jmg Exp $");
/*
* Cp copies source files to target files.
@@ -366,7 +366,7 @@
* normally want to preserve them on directories.
*/
if (pflag) {
- if (setfile(curr->fts_statp, 0))
+ if (setfile(curr->fts_statp, -1))
rval = 1;
} else {
mode = curr->fts_statp->st_mode;
==== //depot/projects/ia64/bin/pwd/pwd.c#6 (text+ko) ====
@@ -43,7 +43,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.21 2003/05/01 16:58:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.22 2003/06/30 17:05:40 kan Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -108,7 +108,7 @@
static char *
getcwd_logical(void)
{
- struct stat log, phy;
+ struct stat lg, phy;
char *pwd;
/*
@@ -116,9 +116,9 @@
* the current working directory.
*/
if ((pwd = getenv("PWD")) != NULL && *pwd == '/') {
- if (stat(pwd, &log) == -1 || stat(".", &phy) == -1)
+ if (stat(pwd, &lg) == -1 || stat(".", &phy) == -1)
return (NULL);
- if (log.st_dev == phy.st_dev && log.st_ino == phy.st_ino)
+ if (lg.st_dev == phy.st_dev && lg.st_ino == phy.st_ino)
return (pwd);
}
==== //depot/projects/ia64/contrib/lukemftp/FreeBSD-patchset#2 (text+ko) ====
@@ -41,7 +41,7 @@
#include "progressbar.h"
+
-+#define SECSPERHOUR 60
++#define SECSPERHOUR (60 * 60)
+#define SECSPERDAY ((long)60 * 60 * 24)
#if !defined(NO_PROGRESS)
==== //depot/projects/ia64/contrib/lukemftp/src/ftp.1#5 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.94 2003/05/14 14:31:00 wiz Exp $
+.\" $NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -1030,7 +1030,7 @@
Answer
.Sq yes ,
and transfer the file.
-.It Cm ?
+.It Cm \&?
Display a help message.
.El
.Pp
@@ -1433,7 +1433,7 @@
.It Ic xferbuf Ar size
Set the size of the socket send and receive buffers to
.Ar size .
-.It Ic ? Op Ar command
+.It Ic \&? Op Ar command
A synonym for
.Ic help .
.El
==== //depot/projects/ia64/contrib/lukemftp/src/progressbar.c#2 (text+ko) ====
@@ -62,7 +62,7 @@
#include "progressbar.h"
-#define SECSPERHOUR 60
+#define SECSPERHOUR (60 * 60)
#define SECSPERDAY ((long)60 * 60 * 24)
#if !defined(NO_PROGRESS)
==== //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#5 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $
#
# If there is a global system configuration file, suck it in.
@@ -41,7 +41,7 @@
case "$daily_status_security_ipfwdenied_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then
check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:"
fi
==== //depot/projects/ia64/etc/periodic/security/510.ipfdenied#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.1 2002/10/25 15:16:54 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.2 2003/06/30 22:06:26 mtm Exp $
#
# If there is a global system configuration file, suck it in.
@@ -41,7 +41,7 @@
case "$daily_status_security_ipfdenied_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
if ipfstat -nhio 2>/dev/null | grep block > ${TMP}; then
check_diff new_only ipf ${TMP} "${host} ipf denied packets:"
fi
==== //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#6 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $
+# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $
#
# Show ipfw rules which have reached the log limit
@@ -42,7 +42,7 @@
case "$daily_status_security_ipfwlimit_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null`
if [ $? -eq 0 ] && [ "${IPFW_LOG_LIMIT}" -ne 0 ]; then
ipfw -a l | grep " log " | \
==== //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#5 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.5 2003/06/30 22:06:26 mtm Exp $
#
# If there is a global system configuration file, suck it in.
@@ -41,7 +41,7 @@
case "$daily_status_security_ip6fwdenied_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then
check_diff new_only ip6fw ${TMP} "${host} ip6fw denied packets:"
fi
==== //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#6 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.5 2002/12/07 23:37:44 keramida Exp $
+# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.6 2003/06/30 22:06:26 mtm Exp $
#
# Show ip6fw rules which have reached the log limit
@@ -42,7 +42,7 @@
case "$daily_status_security_ip6fwlimit_enable" in
[Yy][Ee][Ss])
- TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ TMP=`mktemp -t security`
IP6FW_LOG_LIMIT=`sysctl -n net.inet6.ip6.fw.verbose_limit 2> /dev/null`
if [ $? -eq 0 ] && [ "${IP6FW_LOG_LIMIT}" -ne 0 ]; then
ip6fw -a l | grep " log " | \
==== //depot/projects/ia64/etc/periodic/security/security.functions#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.3 2003/06/30 22:06:26 mtm Exp $
#
#
@@ -52,7 +52,7 @@
msg="$1"; shift
if [ "${tmpf}" = "-" ]; then
- tmpf=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
+ tmpf=`mktemp -t security`
cat > ${tmpf}
fi
==== //depot/projects/ia64/etc/rc.d/initdiskless#8 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/initdiskless,v 1.23 2003/02/15 16:29:20 jhay Exp $
+# $FreeBSD: src/etc/rc.d/initdiskless,v 1.24 2003/06/30 21:47:06 brooks Exp $
#
# PROVIDE: initdiskless
# KEYWORD: FreeBSD
@@ -149,6 +149,17 @@
done
echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca}"
+# Figure out our NFS root path
+#
+set `mount -t nfs`
+while [ $# -ge 1 ] ; do
+ if [ "$2" = "on" -a "$3" = "/" ]; then
+ nfsroot="$1"
+ break
+ fi
+ shift
+done
+
# Resolve templates in /conf/base, /conf/default, /conf/${bootp_ipbca},
# and /conf/${bootp_ipa}. For each subdirectory found within these
# directories:
@@ -164,6 +175,10 @@
# might contain 'myserver:/etc'. NFS remounts allow you to avoid
# having to dup your system directories in /conf. Your server must
# be sure to export those filesystems -alldirs, however.
+# If the diskless_remount file contains a string beginning with a
+# '/' it is assumed that the local nfsroot should be prepended to
+# it before attemping to the remount. This allows the root to be
+# relocated without needing to change the remount files.
#
for i in base default ${bootp_ipbca} ${bootp_ipa} ; do
for j in /conf/$i/* ; do
@@ -178,6 +193,9 @@
#
if [ -d $j -a -f $j/diskless_remount ]; then
nfspt=`/bin/cat $j/diskless_remount`
+ if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then
+ nfspt="${nfsroot}${nfspt}"
+ fi
mount_nfs $nfspt $j
chkerr $? "mount_nfs $nfspt $j"
fi
==== //depot/projects/ia64/etc/rc.d/ldconfig#7 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ldconfig,v 1.6 2003/05/18 03:39:39 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.7 2003/06/30 15:02:05 trhodes Exp $
#
# PROVIDE: ldconfig
@@ -25,8 +25,8 @@
checkyesno ldconfig_insecure && _ins="-i"
if [ -x "${ldconfig_command}" ]; then
_LDC=/usr/lib
- for i in ${ldconfig_paths}; do
- if [ -d "${i}" ]; then
+ for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
+ if [ -r "${i}" ]; then
_LDC="${_LDC} ${i}"
fi
done
@@ -39,8 +39,8 @@
# Default the a.out ldconfig path.
: ${ldconfig_paths_aout=${ldconfig_paths}}
_LDC=/usr/lib/aout
- for i in ${ldconfig_paths_aout}; do
- if [ -d "${i}" ]; then
+ for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
+ if [ -r "${i}" ]; then
_LDC="${_LDC} ${i}"
fi
done
==== //depot/projects/ia64/etc/rc.d/motd#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/motd,v 1.5 2003/04/29 06:56:40 dougb Exp $
+# $FreeBSD: src/etc/rc.d/motd,v 1.6 2003/06/30 22:06:26 mtm Exp $
#
# PROVIDE: motd
@@ -38,7 +38,7 @@
case ${OSTYPE} in
FreeBSD)
- T=`mktemp /tmp/_motd.XXXXXX`
+ T=`mktemp -t motd`
uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
;;
==== //depot/projects/ia64/gnu/lib/libg2c/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.10 2002/09/28 00:25:27 peter Exp $
+# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.11 2003/06/30 19:11:20 ru Exp $
SRCDIR= ${.CURDIR}/../../../contrib/libf2c
@@ -98,22 +98,16 @@
${E77OBJS}: f2cext.c
${CC} ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
- @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.if !defined(NOPIC)
${E77OBJS:.o=.So}: f2cext.c
${CC} ${PICFLAG} -DPIC ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} \
${.ALLSRC:M*.c}
- @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.endif
.if !defined(NOPROFILE)
${E77OBJS:.o=.po}: f2cext.c
${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
- @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.endif
INCS= g2c.h
==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.48 2003/06/13 22:07:39 peter Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.49 2003/06/30 19:11:20 ru Exp $
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
@@ -37,7 +37,6 @@
CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK
CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \
-I${GCCDIR}/config -I${GCCDIR} -I.
-LDFLAGS= -nostdlib
OBJS= # added to below in various ways depending on TARGET_ARCH
@@ -190,21 +189,15 @@
${OBJS_T}: libgcc2.c
${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
- @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.if !defined(NOPIC)
${OBJS_S}: libgcc2.c
${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
- @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.endif
.if !defined(NOPROFILE)
${OBJS_P}: libgcc2.c
${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
- @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.endif
.if defined(LIB1ASMSRC)
@@ -212,23 +205,17 @@
${ASM_T}: ${_lib1asmsrc}
${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
-o ${.TARGET} ${.ALLSRC:N*.h}
- @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.if !defined(NOPIC)
${ASM_S}: ${_lib1asmsrc}
${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
-o ${.TARGET} ${.ALLSRC:N*.h}
- @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.endif
.if !defined(NOPROFILE)
${ASM_P}: ${_lib1asmsrc}
${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
-o ${.TARGET} ${.ALLSRC:N*.h}
- @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
- @mv ${.TARGET}.tmp ${.TARGET}
.endif
.endfor
.endif
==== //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.16 2003/02/25 15:41:49 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.17 2003/07/01 14:04:08 ru Exp $
.include "../Makefile.inc0"
@@ -7,12 +7,11 @@
.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc ${GDBDIR}/gdb/mi
-INFO = as ld annotate gasp gdb gdbint stabs binutils
+INFO = as ld gasp gdb gdbint stabs binutils
INFOSECTION= "Programming & development tools."
INFOENTRY_as= "* As: (as). The GNU assembler."
INFOENTRY_gasp= "* Gasp: (gasp). The GNU Assembler Macro Preprocessor."
INFOENTRY_ld= "* Ld: (ld). The GNU linker."
-INFOENTRY_annotate= "* GDB annotation: (annotate). Annotations for the GNU Debugger (GDB)."
INFOENTRY_binutils= "* Binutils: (binutils). The GNU Binary Utilities."
MAKEINFOFLAGS+= --no-validate
==== //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.amd64#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.amd64,v 1.2 2003/07/01 17:12:55 obrien Exp $
TARGET_TUPLE?= x86_64-obrien-freebsd
@@ -18,3 +18,17 @@
sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_x86_64_path} \
${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
"${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}"
+
+X86_EMULATION= elf_i386_fbsd
+_i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\"
+EMS+= ${X86_EMULATION}
+LDSCRIPTS+= ${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \
+ ${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc
+SRCS+= e${X86_EMULATION}.c
+CLEANFILES+= e${X86_EMULATION}.c
+
+e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
+ genscripts.sh stringify.sed
+ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
+ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+ "${X86_EMULATION}" "" ${X86_EMULATION} "${TARGET_TUPLE}"
==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.2 2003/07/01 17:29:48 obrien Exp $
.include "${.CURDIR}/Makefile.i386"
# Get the i386 DEFAULT_VECTOR and VECS.
-I386_VECS:= ${DEFAULT_VECTOR} ${VECS}
+I386_VECS:= ${DEFAULT_VECTOR} # ${VECS}
DEFAULT_VECTOR= bfd_elf64_x86_64_vec
==== //depot/projects/ia64/gnu/usr.bin/cc/f77doc/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/f77doc/Makefile,v 1.4 2002/05/10 08:54:48 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/f77doc/Makefile,v 1.5 2003/07/01 14:46:26 ru Exp $
.include "../Makefile.inc"
@@ -7,6 +7,7 @@
INFO= g77
MAKEINFOFLAGS+= -I ${GCCDIR}/f -I ${GCCDIR}/doc/include
+MAKEINFOFLAGS+= -D "srcdir src/contrib"
g77.info: g77.texi intdoc.texi ffe.texi invoke.texi news.texi bugs.texi \
../doc/include/gpl.texi ../doc/include/fdl.texi ../doc/include/funding.texi
==== //depot/projects/ia64/include/unistd.h#18 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.67 2003/06/29 17:33:34 gordon Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.68 2003/07/01 12:09:06 bde Exp $
*/
#ifndef _UNISTD_H_
@@ -335,7 +335,6 @@
int execv(const char *, char * const *);
int execve(const char *, char * const *, char * const *);
int execvp(const char *, char * const *);
-int execvP(const char *, const char *, char * const *);
pid_t fork(void);
long fpathconf(int, int);
char *getcwd(char *, size_t);
@@ -471,6 +470,7 @@
int des_setkey(const char *key);
void endusershell(void);
int exect(const char *, char * const *, char * const *);
+int execvP(const char *, const char *, char * const *);
char *fflagstostr(u_long);
int getdomainname(char *, int);
int getgrouplist(const char *, gid_t, gid_t *, int *);
==== //depot/projects/ia64/lib/csu/amd64/Makefile#2 (text+ko) ====
@@ -1,14 +1,12 @@
-# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.17 2002/07/29 09:40:11 ru Exp $
+# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.18 2003/06/30 12:53:39 ru Exp $
.PATH: ${.CURDIR}/../common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= gcrt1.o
-CFLAGS+= -elf -Wall \
- -I${.CURDIR}/../common \
+CFLAGS+= -I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include
-LDFLAGS+= -elf
all: ${OBJS}
==== //depot/projects/ia64/lib/libc/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.40 2003/03/13 18:55:14 obrien Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.41 2003/07/01 15:07:01 ru 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
@@ -10,8 +10,8 @@
# system call stubs.
LIB=c
SHLIB_MAJOR= 5
-AINC= -I${.CURDIR}/${MACHINE_ARCH}
-CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include ${AINC}
+CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
+CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
CLEANFILES+=tags
INSTALL_PIC_ARCHIVE= yes
PRECIOUSLIB= yes
==== //depot/projects/ia64/lib/libc/gen/exec.c#6 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.21 2003/06/29 17:33:34 gordon Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.22 2003/07/01 12:30:03 bde Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -142,14 +142,15 @@
}
int
-execvp(const char *name, char *const *argv)
+execvp(const char *name, char * const *argv)
{
const char *path;
/* Get the path we're searching. */
- if (!(path = getenv("PATH")))
+ if ((path = getenv("PATH")) == NULL)
path = _PATH_DEFPATH;
- return(execvP(name,path,argv));
+
+ return (execvP(name, path, argv));
}
int
@@ -187,12 +188,12 @@
return (-1);
}
strcpy(cur, path);
- while ( (p = strsep(&cur, ":")) ) {
+ while ((p = strsep(&cur, ":")) != NULL) {
/*
* It's a SHELL path -- double, leading and trailing colons
* mean the current directory.
*/
- if (!*p) {
+ if (*p == '\0') {
p = ".";
lp = 1;
} else
@@ -217,7 +218,7 @@
buf[lp + ln + 1] = '\0';
retry: (void)_execve(bp, argv, environ);
- switch(errno) {
+ switch (errno) {
case E2BIG:
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list