PERFORCE change 179267 for review
Alexander Motin
mav at FreeBSD.org
Sun Jun 6 20:06:43 UTC 2010
http://p4web.freebsd.org/@@179267?ac=10
Change 179267 by mav at mav_mavbook on 2010/06/06 20:05:50
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/bin/chio/chio.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/cp/cp.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/date/date.1#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/eval.c#13 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#7 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/main.c#8 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/myhistedit.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#15 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.c#10 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.h#5 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/bfd/archures.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/bfd/bfd-in2.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/bfd/cpu-mips.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/bfd/elfxx-mips.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/gas/config/tc-mips.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/gas/config/tc-mips.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/include/elf/mips.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/include/opcode/mips.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/opcodes/mips-dis.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/opcodes/mips-opc.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/opcodes/mips16-opc.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/fixdfdi.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/fixsfdi.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/fixunsdfsi.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/fixunssfsi.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/floatdidf.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/floatdisf.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/floatundidf.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/floatundisf.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/mips/freebsd.h#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/mips/mips.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/mips/mips.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/mips/mips.md#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/gdtoa/hexnan.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/moduli.5#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/scp.1#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-server.8#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sftp.1#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-add.1#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-agent.1#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.1#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keyscan.1#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keysign.8#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh.1#6 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config.5#6 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.8#5 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config.5#6 integrate
.. //depot/projects/scottl-camlock/src/games/pom/pom.6#4 integrate
.. //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/gnu/lib/libgomp/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/Makefile.inc0#3 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/ld/Makefile.mips#4 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/libbfd/bfd.h#3 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_entry.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_set.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_strip.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_support.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_support.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_to_text_nfs4.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_valid.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_compare_name.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.ucf.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmclog.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/msun/man/atan2.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/msun/man/remainder.3#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rbootd/rbootd.8#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#13 integrate
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#7 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/gpart.8#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#8 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/acpi.4#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/io.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mpt.4#7 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/devfs.5#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/make_dev.9#5 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#38 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#46 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_reg.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/fpu.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btxldr/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/mbr/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/pmbr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btxldr/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/cdboot/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/boot1/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#92 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#53 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#158 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#21 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/libfdt/libfdt_env.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock_cipher.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock_hash.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#115 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amdsbwd/amdsbwd.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#32 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#42 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cas/if_cas.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_acpi.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdt_common.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdt_common.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdt_pci.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdt_static_dtb.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdtbus.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/simplebus.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iic.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/random/nehemiah.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#50 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_fdt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vnops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/mountver/g_mountver.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_bsd.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#50 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/ptrace_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/swtch.s#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/npx.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pcb.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pcpu.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/npx.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_ptrace.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/posix4_mib.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_shm.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/memchr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pppoe.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/pim_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/opencrypto/crypto.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/kiic.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/macgpio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smu.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smusat.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorth.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/intr_machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_task.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/libkern.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/posix4.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vtoc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/tools/fdt/embed_dtb.sh#1 branch
.. //depot/projects/scottl-camlock/src/sys/tools/fdt/make_dtbh.sh#1 branch
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#21 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/dot1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/dot2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/exec1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/exec2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/return4.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/heredoc4.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/heredoc5.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/heredoc6.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/jot/regress.rand1.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/jot/regress.rand2.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/jot/regress.sh#5 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/jot/regress.stutter2.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/README#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp_client.c#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp_server.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/bc/scan.l#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#11 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/locale.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/sunpos.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/dc/dc.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/join/join.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/jot/jot.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/jot/jot.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/newkey/newkey.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chown/chown.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#10 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/tzsetup/tzsetup.c#5 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/bin/chio/chio.c#3 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.29 2010/06/02 09:34:41 uqs Exp $");
#include <sys/param.h>
#include <sys/chio.h>
@@ -1072,6 +1072,7 @@
/* Read in the changer slots */
if (cp.cp_nslots > 0) {
+ (void) memset(&cesr, 0, sizeof(cesr));
cesr.cesr_element_type = CHET_ST;
cesr.cesr_element_base = 0;
cesr.cesr_element_count = cp.cp_nslots;
==== //depot/projects/scottl-camlock/src/bin/cp/cp.c#4 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.61 2010/01/17 09:37:31 gavin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.62 2010/06/05 08:50:39 trasz Exp $");
/*
* Cp copies source files to target files.
@@ -466,6 +466,7 @@
case S_IFSOCK:
warnx("%s is a socket (not copied).",
curr->fts_path);
+ break;
case S_IFIFO:
if (Rflag) {
if (copy_fifo(curr->fts_statp, !dne))
==== //depot/projects/scottl-camlock/src/bin/date/date.1#4 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.76 2010/01/21 17:25:12 ed Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.77 2010/06/04 06:56:58 brian Exp $
.\"
-.Dd June 2, 2007
+.Dd June 3, 2010
.Dt DATE 1
.Os
.Sh NAME
@@ -219,6 +219,14 @@
the resulting timezone will be set so that the date matches the earlier of
the two times.
.Pp
+It is not possible to adjust a date to an invalid absolute day, so using
+the switches
+.Fl v No 31d Fl v No 12m
+will simply fail five months of the year.
+It is therefore usual to set the month before setting the day; using
+.Fl v No 12m Fl v No 31d
+always works.
+.Pp
Adjusting the date by months is inherently ambiguous because
a month is a unit of variable length depending on the current date.
This kind of date adjustment is applied in the most intuitive way.
@@ -339,9 +347,9 @@
.Pp
.Dl "Tue Feb 29 03:18:00 GMT 2000"
.Pp
-So will do the command:
+So will the command:
.Pp
-.Dl "date -v30d -v3m -v0y -v-1m"
+.Dl "date -v3m -v30d -v0y -v-1m"
.Pp
because there is no such date as the 30th of February.
.Pp
==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#13 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.82 2010/05/08 14:00:01 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.83 2010/05/28 22:40:24 jilles Exp $");
#include <paths.h>
#include <signal.h>
@@ -1170,6 +1170,12 @@
int
execcmd(int argc, char **argv)
{
+ /*
+ * Because we have historically not supported any options,
+ * only treat "--" specially.
+ */
+ if (argc > 1 && strcmp(argv[1], "--") == 0)
+ argc--, argv++;
if (argc > 1) {
struct strlist *sp;
==== //depot/projects/scottl-camlock/src/bin/sh/histedit.c#7 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.34 2009/12/27 18:04:05 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.35 2010/06/02 19:16:58 jilles Exp $");
#include <sys/param.h>
#include <limits.h>
@@ -98,6 +98,8 @@
/*
* turn editing on
*/
+ char *term;
+
INTOFF;
if (el_in == NULL)
el_in = fdopen(0, "r");
@@ -107,6 +109,11 @@
el_out = fdopen(2, "w");
if (el_in == NULL || el_err == NULL || el_out == NULL)
goto bad;
+ term = lookupvar("TERM");
+ if (term)
+ setenv("TERM", term, 1);
+ else
+ unsetenv("TERM");
el = el_init(arg0, el_in, el_out, el_err);
if (el != NULL) {
if (hist)
@@ -160,6 +167,13 @@
}
}
+void
+setterm(const char *term)
+{
+ if (rootshell && el != NULL && term != NULL)
+ el_set(el, EL_TERMINAL, term);
+}
+
int
histcmd(int argc, char **argv)
{
==== //depot/projects/scottl-camlock/src/bin/sh/main.c#8 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.38 2010/04/17 14:35:46 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.39 2010/05/28 22:40:24 jilles Exp $");
#include <stdio.h>
#include <signal.h>
@@ -314,14 +314,20 @@
int
dotcmd(int argc, char **argv)
{
- char *fullname;
+ char *filename, *fullname;
if (argc < 2)
error("missing filename");
exitstatus = 0;
- fullname = find_dot_file(argv[1]);
+ /*
+ * Because we have historically not supported any options,
+ * only treat "--" specially.
+ */
+ filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1];
+
+ fullname = find_dot_file(filename);
setinputfile(fullname, 1);
commandname = fullname;
cmdloop(0);
==== //depot/projects/scottl-camlock/src/bin/sh/myhistedit.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)myhistedit.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/myhistedit.h,v 1.11 2009/12/24 18:41:14 jilles Exp $
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.12 2010/06/02 19:16:58 jilles Exp $
*/
#include <histedit.h>
@@ -38,6 +38,7 @@
void histedit(void);
void sethistsize(const char *);
+void setterm(const char *);
int histcmd(int, char **);
int not_fcnumber(const char *);
int str_to_event(const char *, int);
==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#15 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.78 2010/04/11 12:24:47 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -203,6 +203,7 @@
* which could happen if we add command substitution on PS1/PS2.
*/
parser_temp_free_all();
+ heredoclist = NULL;
tokpushback = 0;
doprompt = interact;
@@ -973,6 +974,8 @@
const int bq_startlinno = plinno;
char *volatile ostr = NULL;
struct parsefile *const savetopfile = getcurrentfile();
+ struct heredoc *const saveheredoclist = heredoclist;
+ struct heredoc *here;
str = NULL;
if (setjmp(jmploc.loc)) {
@@ -981,6 +984,7 @@
ckfree(str);
if (ostr)
ckfree(ostr);
+ heredoclist = saveheredoclist;
handler = savehandler;
if (exception == EXERROR) {
startlinno = bq_startlinno;
@@ -995,6 +999,7 @@
memcpy(str, stackblock(), savelen);
}
handler = &jmploc;
+ heredoclist = NULL;
INTON;
if (oldstyle) {
/* We must read until the closing backquote, giving special
@@ -1091,21 +1096,26 @@
while (stackblocksize() <= savelen)
growstackblock();
STARTSTACKSTR(out);
+ INTOFF;
if (str) {
memcpy(out, str, savelen);
STADJUST(savelen, out);
- INTOFF;
ckfree(str);
str = NULL;
- INTON;
}
if (ostr) {
- INTOFF;
ckfree(ostr);
ostr = NULL;
- INTON;
+ }
+ here = saveheredoclist;
+ if (here != NULL) {
+ while (here->next != NULL)
+ here = here->next;
+ here->next = heredoclist;
+ heredoclist = saveheredoclist;
}
handler = savehandler;
+ INTON;
if (quoted)
USTPUTC(CTLBACKQ | CTLQUOTE, out);
else
==== //depot/projects/scottl-camlock/src/bin/sh/var.c#10 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.46 2010/05/05 21:48:40 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.47 2010/06/02 19:16:58 jilles Exp $");
#include <unistd.h>
#include <stdlib.h>
@@ -80,6 +80,7 @@
#ifndef NO_HISTORY
struct var vhistsize;
+struct var vterm;
#endif
struct var vifs;
struct var vmail;
@@ -114,6 +115,10 @@
NULL },
{ &vps4, 0, "PS4=+ ",
NULL },
+#ifndef NO_HISTORY
+ { &vterm, VUNSET, "TERM=",
+ setterm },
+#endif
{ &voptind, 0, "OPTIND=1",
getoptsreset },
{ NULL, 0, NULL,
==== //depot/projects/scottl-camlock/src/bin/sh/var.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)var.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/var.h,v 1.17 2010/05/05 21:48:40 jilles Exp $
+ * $FreeBSD: src/bin/sh/var.h,v 1.18 2010/06/02 19:16:58 jilles Exp $
*/
/*
@@ -77,6 +77,7 @@
extern struct var vps4;
#ifndef NO_HISTORY
extern struct var vhistsize;
+extern struct var vterm;
#endif
/*
@@ -96,6 +97,7 @@
#define optindval() (voptind.text + 7)
#ifndef NO_HISTORY
#define histsizeval() (vhistsize.text + 9)
+#define termval() (vterm.text + 5)
#endif
#define mpathset() ((vmpath.flags & VUNSET) == 0)
==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#5 (text+ko) ====
@@ -1791,7 +1791,6 @@
/* We don't support those properties on FreeBSD. */
switch (prop) {
case ZFS_PROP_DEVICES:
- case ZFS_PROP_ZONED:
case ZFS_PROP_SHAREISCSI:
case ZFS_PROP_ISCSIOPTIONS:
case ZFS_PROP_XATTR:
==== //depot/projects/scottl-camlock/src/contrib/binutils/bfd/archures.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* BFD library support routines for architectures.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
Hacked by John Gilmore and Steve Chamberlain of Cygnus Support.
@@ -18,7 +18,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#include "bfd.h"
#include "sysdep.h"
@@ -141,10 +141,12 @@
.#define bfd_mach_mips6000 6000
.#define bfd_mach_mips7000 7000
.#define bfd_mach_mips8000 8000
+.#define bfd_mach_mips9000 9000
.#define bfd_mach_mips10000 10000
.#define bfd_mach_mips12000 12000
.#define bfd_mach_mips16 16
.#define bfd_mach_mips5 5
+.#define bfd_mach_mips_octeon 6502
.#define bfd_mach_mips_sb1 12310201 {* octal 'SB', 01 *}
.#define bfd_mach_mipsisa32 32
.#define bfd_mach_mipsisa32r2 33
==== //depot/projects/scottl-camlock/src/contrib/binutils/bfd/bfd-in2.h#2 (text+ko) ====
@@ -8,7 +8,8 @@
/* Main header file for the bfd library -- portable access to object files.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
Contributed by Cygnus Support.
@@ -26,7 +27,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef __BFD_H_SEEN__
#define __BFD_H_SEEN__
==== //depot/projects/scottl-camlock/src/contrib/binutils/bfd/cpu-mips.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* bfd back-end for mips support
Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
- 2002, 2003 Free Software Foundation, Inc.
+ 2002, 2003, 2004 Free Software Foundation, Inc.
Written by Steve Chamberlain of Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#include "bfd.h"
#include "sysdep.h"
@@ -76,6 +76,7 @@
I_mips6000,
I_mips7000,
I_mips8000,
+ I_mips9000,
I_mips10000,
I_mips12000,
I_mips16,
@@ -84,6 +85,7 @@
I_mipsisa32r2,
I_mipsisa64,
I_mipsisa64r2,
+ I_mipsocteon,
I_sb1,
};
@@ -108,6 +110,7 @@
N (32, 32, bfd_mach_mips6000, "mips:6000", FALSE, NN(I_mips6000)),
N (64, 64, bfd_mach_mips7000, "mips:7000", FALSE, NN(I_mips7000)),
N (64, 64, bfd_mach_mips8000, "mips:8000", FALSE, NN(I_mips8000)),
+ N (64, 64, bfd_mach_mips9000, "mips:9000", FALSE, NN(I_mips9000)),
N (64, 64, bfd_mach_mips10000,"mips:10000", FALSE, NN(I_mips10000)),
N (64, 64, bfd_mach_mips12000,"mips:12000", FALSE, NN(I_mips12000)),
N (64, 64, bfd_mach_mips16, "mips:16", FALSE, NN(I_mips16)),
@@ -116,6 +119,7 @@
N (32, 32, bfd_mach_mipsisa32r2,"mips:isa32r2", FALSE, NN(I_mipsisa32r2)),
N (64, 64, bfd_mach_mipsisa64, "mips:isa64", FALSE, NN(I_mipsisa64)),
N (64, 64, bfd_mach_mipsisa64r2,"mips:isa64r2", FALSE, NN(I_mipsisa64r2)),
+ N (64, 64, bfd_mach_mips_octeon,"mips:octeon", FALSE, NN(I_mipsocteon)),
N (64, 64, bfd_mach_mips_sb1, "mips:sb1", FALSE, 0),
};
==== //depot/projects/scottl-camlock/src/contrib/binutils/bfd/elfxx-mips.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* MIPS-specific support for ELF
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Most of the information added by Ian Lance Taylor, Cygnus Support,
<ian at cygnus.com>.
@@ -23,7 +23,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
/* This file handles functionality common to the different MIPS ABI's. */
@@ -4088,6 +4088,12 @@
case E_MIPS_MACH_5500:
return bfd_mach_mips5500;
+ case E_MIPS_MACH_9000:
+ return bfd_mach_mips9000;
+
+ case E_MIPS_MACH_OCTEON:
+ return bfd_mach_mips_octeon;
+
case E_MIPS_MACH_SB1:
return bfd_mach_mips_sb1;
@@ -7142,6 +7148,10 @@
val = E_MIPS_ARCH_4 | E_MIPS_MACH_5500;
break;
+ case bfd_mach_mips9000:
+ val = E_MIPS_ARCH_4 | E_MIPS_MACH_9000;
+ break;
+
case bfd_mach_mips5000:
case bfd_mach_mips7000:
case bfd_mach_mips8000:
@@ -7154,6 +7164,10 @@
val = E_MIPS_ARCH_5;
break;
+ case bfd_mach_mips_octeon:
+ val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON;
+ break;
+
case bfd_mach_mips_sb1:
val = E_MIPS_ARCH_64 | E_MIPS_MACH_SB1;
break;
@@ -8856,6 +8870,9 @@
are ordered topologically with MIPS I extensions listed last. */
static const struct mips_mach_extension mips_mach_extensions[] = {
+ /* MIPS64r2 extensions. */
+ { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
+
/* MIPS64 extensions. */
{ bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
{ bfd_mach_mips_sb1, bfd_mach_mipsisa64 },
@@ -8879,6 +8896,7 @@
{ bfd_mach_mips10000, bfd_mach_mips8000 },
{ bfd_mach_mips5000, bfd_mach_mips8000 },
{ bfd_mach_mips7000, bfd_mach_mips8000 },
+ { bfd_mach_mips9000, bfd_mach_mips8000 },
/* VR4100 extensions. */
{ bfd_mach_mips4120, bfd_mach_mips4100 },
@@ -8913,11 +8931,26 @@
{
size_t i;
- for (i = 0; extension != base && i < ARRAY_SIZE (mips_mach_extensions); i++)
+ if (extension == base)
+ return TRUE;
+
+ if (base == bfd_mach_mipsisa32
+ && mips_mach_extends_p (bfd_mach_mipsisa64, extension))
+ return TRUE;
+
+ if (base == bfd_mach_mipsisa32r2
+ && mips_mach_extends_p (bfd_mach_mipsisa64r2, extension))
+ return TRUE;
+
+ for (i = 0; i < ARRAY_SIZE (mips_mach_extensions); i++)
if (extension == mips_mach_extensions[i].extension)
- extension = mips_mach_extensions[i].base;
+ {
+ extension = mips_mach_extensions[i].base;
+ if (extension == base)
+ return TRUE;
+ }
- return extension == base;
+ return FALSE;
}
==== //depot/projects/scottl-camlock/src/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* tc-mips.c -- assemble code for a MIPS chip.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004 Free Software Foundation, Inc.
+ 2003, 2004, 2005 Free Software Foundation, Inc.
Contributed by the OSF and Ralph Campbell.
Written by Keith Knowles and Ralph Campbell, working independently.
Modified for ECOFF and R4000 support by Ian Lance Taylor of Cygnus
@@ -20,8 +20,8 @@
You should have received a copy of the GNU General Public License
along with GAS; see the file COPYING. If not, write to the Free
- Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include "as.h"
#include "config.h"
@@ -33,6 +33,7 @@
#include "opcode/mips.h"
#include "itbl-ops.h"
#include "dwarf2dbg.h"
+#include "dw2gencfi.h"
#ifdef DEBUG
#define DBG(x) printf x
@@ -83,6 +84,25 @@
int mips_flag_pdr = TRUE;
#endif
+/* Control generation of error message for unsupported instructions in
+ Octeon. Octeon does not have floating point, and all the instructions
+ that use floating point registers are not allowed in Elf targets but
+ are allowed in Linux targets by default. */
+#ifdef OCTEON_ERROR_ON_UNSUPPORTED
+static int octeon_error_on_unsupported = 1;
+#else
+static int octeon_error_on_unsupported = 0;
+#endif
+
+/* Control generation of Octeon/MIPS unaligned load/store instructions.
+ For ELF target, default to Octeon load/store instructions.
+ For Linux target, default to MIPS load/store instructions. */
+#ifdef OCTEON_USE_UNALIGN
+static int octeon_use_unalign = 1;
+#else
+static int octeon_use_unalign = 0;
+#endif
+
#include "ecoff.h"
#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
@@ -111,9 +131,7 @@
extern int target_big_endian;
/* The name of the readonly data section. */
-#define RDATA_SECTION_NAME (OUTPUT_FLAVOR == bfd_target_aout_flavour \
- ? ".data" \
- : OUTPUT_FLAVOR == bfd_target_ecoff_flavour \
+#define RDATA_SECTION_NAME (OUTPUT_FLAVOR == bfd_target_ecoff_flavour \
? ".rdata" \
: OUTPUT_FLAVOR == bfd_target_coff_flavour \
? ".rdata" \
@@ -121,6 +139,43 @@
? ".rodata" \
: (abort (), ""))
+/* Information about an instruction, including its format, operands
+ and fixups. */
+struct mips_cl_insn
+{
+ /* The opcode's entry in mips_opcodes or mips16_opcodes. */
+ const struct mips_opcode *insn_mo;
+
+ /* True if this is a mips16 instruction and if we want the extended
+ form of INSN_MO. */
+ bfd_boolean use_extend;
+
+ /* The 16-bit extension instruction to use when USE_EXTEND is true. */
+ unsigned short extend;
+
+ /* The 16-bit or 32-bit bitstring of the instruction itself. This is
+ a copy of INSN_MO->match with the operands filled in. */
+ unsigned long insn_opcode;
+
+ /* The frag that contains the instruction. */
+ struct frag *frag;
+
+ /* The offset into FRAG of the first instruction byte. */
+ long where;
+
+ /* The relocs associated with the instruction, if any. */
+ fixS *fixp[3];
+
+ /* True if this entry cannot be moved from its current position. */
+ unsigned int fixed_p : 1;
+
+ /* True if this instruction occured in a .set noreorder block. */
+ unsigned int noreorder_p : 1;
+
+ /* True for mips16 instructions that jump to an absolute address. */
+ unsigned int mips16_absolute_jump_p : 1;
+};
+
/* The ABI to use. */
enum mips_abi_level
{
@@ -138,6 +193,10 @@
/* Whether or not we have code that can call pic code. */
int mips_abicalls = FALSE;
+/* Whether or not we have code which can be put into a shared
+ library. */
+static bfd_boolean mips_in_shared = TRUE;
+
/* This is the set of options which may be modified by the .set
pseudo-op. We use a struct so that .set push and .set pop are more
reliable. */
@@ -153,6 +212,8 @@
command line options, and based on the default architecture. */
int ase_mips3d;
int ase_mdmx;
+ int ase_dsp;
+ int ase_mt;
/* Whether we are assembling for the mips16 processor. 0 if we are
not, 1 if we are, and -1 if the value has not been initialized.
Changed by `.set mips16' and `.set nomips16', and the -mips16 and
@@ -187,6 +248,8 @@
/* MIPS architecture (CPU) type. Changed by .set arch=FOO, the -march
command line option, and the default CPU. */
int arch;
+ /* True if ".set sym32" is in effect. */
+ bfd_boolean sym32;
};
/* True if -mgp32 was passed. */
@@ -201,7 +264,7 @@
static struct mips_set_options mips_opts =
{
- ISA_UNKNOWN, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, CPU_UNKNOWN
+ ISA_UNKNOWN, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, CPU_UNKNOWN, FALSE
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list