svn commit: r209040 - in projects/clangbsd: . bin/chio bin/cp bin/date bin/getfacl bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/binutils/bfd contrib/binutils/gas/config contrib/binu...

Fri Jun 11 13:10:33 UTC 2010

Author: rdivacky
Date: Fri Jun 11 13:10:32 2010
New Revision: 209040
URL: http://svn.freebsd.org/changeset/base/209040

Log:
  Merge form head.

Added:
  projects/clangbsd/contrib/gcc/config/fixdfdi.c
     - copied unchanged from r209037, head/contrib/gcc/config/fixdfdi.c
  projects/clangbsd/contrib/gcc/config/fixsfdi.c
     - copied unchanged from r209037, head/contrib/gcc/config/fixsfdi.c
  projects/clangbsd/contrib/gcc/config/fixunsdfsi.c
     - copied unchanged from r209037, head/contrib/gcc/config/fixunsdfsi.c
  projects/clangbsd/contrib/gcc/config/fixunssfsi.c
     - copied unchanged from r209037, head/contrib/gcc/config/fixunssfsi.c
  projects/clangbsd/contrib/gcc/config/floatdidf.c
     - copied unchanged from r209037, head/contrib/gcc/config/floatdidf.c
  projects/clangbsd/contrib/gcc/config/floatdisf.c
     - copied unchanged from r209037, head/contrib/gcc/config/floatdisf.c
  projects/clangbsd/contrib/gcc/config/floatundidf.c
     - copied unchanged from r209037, head/contrib/gcc/config/floatundidf.c
  projects/clangbsd/contrib/gcc/config/floatundisf.c
     - copied unchanged from r209037, head/contrib/gcc/config/floatundisf.c
  projects/clangbsd/share/man/man4/ng_patch.4
     - copied unchanged from r209037, head/share/man/man4/ng_patch.4
  projects/clangbsd/share/mk/bsd.arch.inc.mk
     - copied unchanged from r209037, head/share/mk/bsd.arch.inc.mk
  projects/clangbsd/sys/dev/fdt/
     - copied from r209037, head/sys/dev/fdt/
  projects/clangbsd/sys/dev/uart/uart_bus_fdt.c
     - copied unchanged from r209037, head/sys/dev/uart/uart_bus_fdt.c
  projects/clangbsd/sys/libkern/memchr.c
     - copied unchanged from r209037, head/sys/libkern/memchr.c
  projects/clangbsd/sys/modules/netgraph/patch/
     - copied from r209037, head/sys/modules/netgraph/patch/
  projects/clangbsd/sys/netgraph/ng_patch.c
     - copied unchanged from r209037, head/sys/netgraph/ng_patch.c
  projects/clangbsd/sys/netgraph/ng_patch.h
     - copied unchanged from r209037, head/sys/netgraph/ng_patch.h
  projects/clangbsd/sys/powerpc/powermac/smusat.c
     - copied unchanged from r209037, head/sys/powerpc/powermac/smusat.c
  projects/clangbsd/sys/tools/fdt/
     - copied from r209037, head/sys/tools/fdt/
  projects/clangbsd/sys/x86/x86/io_apic.c
     - copied unchanged from r209037, head/sys/x86/x86/io_apic.c
  projects/clangbsd/sys/x86/x86/mca.c
     - copied unchanged from r209037, head/sys/x86/x86/mca.c
  projects/clangbsd/sys/x86/x86/msi.c
     - copied unchanged from r209037, head/sys/x86/x86/msi.c
  projects/clangbsd/tools/build/options/WITHOUT_CLANG
     - copied unchanged from r209037, head/tools/build/options/WITHOUT_CLANG
  projects/clangbsd/tools/regression/usr.bin/jot/regress.rand1.out
     - copied unchanged from r209037, head/tools/regression/usr.bin/jot/regress.rand1.out
  projects/clangbsd/tools/regression/usr.bin/jot/regress.rand2.out
     - copied unchanged from r209037, head/tools/regression/usr.bin/jot/regress.rand2.out
  projects/clangbsd/tools/regression/usr.bin/jot/regress.stutter2.out
     - copied unchanged from r209037, head/tools/regression/usr.bin/jot/regress.stutter2.out
  projects/clangbsd/tools/tools/vhba/
     - copied from r209037, head/tools/tools/vhba/
Deleted:
  projects/clangbsd/sys/amd64/amd64/io_apic.c
  projects/clangbsd/sys/amd64/amd64/mca.c
  projects/clangbsd/sys/amd64/amd64/msi.c
  projects/clangbsd/sys/i386/i386/io_apic.c
  projects/clangbsd/sys/i386/i386/mca.c
  projects/clangbsd/sys/i386/i386/msi.c
Modified:
  projects/clangbsd/Makefile.inc1
  projects/clangbsd/bin/chio/chio.c
  projects/clangbsd/bin/cp/cp.c
  projects/clangbsd/bin/date/date.1
  projects/clangbsd/bin/getfacl/getfacl.1
  projects/clangbsd/bin/sh/histedit.c
  projects/clangbsd/bin/sh/jobs.c
  projects/clangbsd/bin/sh/myhistedit.h
  projects/clangbsd/bin/sh/var.c
  projects/clangbsd/bin/sh/var.h
  projects/clangbsd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  projects/clangbsd/contrib/binutils/bfd/archures.c
  projects/clangbsd/contrib/binutils/bfd/bfd-in2.h
  projects/clangbsd/contrib/binutils/bfd/cpu-mips.c
  projects/clangbsd/contrib/binutils/bfd/elfxx-mips.c
  projects/clangbsd/contrib/binutils/gas/config/tc-mips.c
  projects/clangbsd/contrib/binutils/gas/config/tc-mips.h
  projects/clangbsd/contrib/binutils/include/elf/mips.h
  projects/clangbsd/contrib/binutils/include/opcode/mips.h
  projects/clangbsd/contrib/binutils/opcodes/mips-dis.c
  projects/clangbsd/contrib/binutils/opcodes/mips-opc.c
  projects/clangbsd/contrib/binutils/opcodes/mips16-opc.c
  projects/clangbsd/contrib/gcc/config/mips/freebsd.h
  projects/clangbsd/contrib/gcc/config/mips/mips.c
  projects/clangbsd/contrib/gcc/config/mips/mips.h
  projects/clangbsd/contrib/gcc/config/mips/mips.md
  projects/clangbsd/contrib/gdtoa/hexnan.c
  projects/clangbsd/contrib/sendmail/mail.local/mail.local.8
  projects/clangbsd/crypto/openssh/moduli.5
  projects/clangbsd/crypto/openssh/scp.1
  projects/clangbsd/crypto/openssh/sftp-server.8
  projects/clangbsd/crypto/openssh/sftp.1
  projects/clangbsd/crypto/openssh/ssh-add.1
  projects/clangbsd/crypto/openssh/ssh-agent.1
  projects/clangbsd/crypto/openssh/ssh-keygen.1
  projects/clangbsd/crypto/openssh/ssh-keyscan.1
  projects/clangbsd/crypto/openssh/ssh-keysign.8
  projects/clangbsd/crypto/openssh/ssh.1
  projects/clangbsd/crypto/openssh/ssh_config.5
  projects/clangbsd/crypto/openssh/sshd.8
  projects/clangbsd/crypto/openssh/sshd_config.5
  projects/clangbsd/games/pom/pom.6
  projects/clangbsd/gnu/lib/libgcc/Makefile
  projects/clangbsd/gnu/lib/libgomp/Makefile
  projects/clangbsd/gnu/usr.bin/binutils/Makefile.inc0
  projects/clangbsd/gnu/usr.bin/binutils/ld/Makefile.mips
  projects/clangbsd/gnu/usr.bin/binutils/libbfd/Makefile.mips
  projects/clangbsd/gnu/usr.bin/binutils/libbfd/bfd.h
  projects/clangbsd/gnu/usr.bin/cc/Makefile.inc
  projects/clangbsd/lib/libarchive/archive_entry.3
  projects/clangbsd/lib/libarchive/archive_read.3
  projects/clangbsd/lib/libarchive/archive_read_disk.3
  projects/clangbsd/lib/libarchive/archive_util.3
  projects/clangbsd/lib/libarchive/archive_write.3
  projects/clangbsd/lib/libarchive/archive_write_disk.3
  projects/clangbsd/lib/libarchive/libarchive-formats.5
  projects/clangbsd/lib/libarchive/tar.5
  projects/clangbsd/lib/libc/gen/getcap.3
  projects/clangbsd/lib/libc/gen/scandir.3
  projects/clangbsd/lib/libc/posix1e/acl_entry.c
  projects/clangbsd/lib/libc/posix1e/acl_set.c
  projects/clangbsd/lib/libc/posix1e/acl_strip.c
  projects/clangbsd/lib/libc/posix1e/acl_support.c
  projects/clangbsd/lib/libc/posix1e/acl_support.h
  projects/clangbsd/lib/libc/posix1e/acl_to_text_nfs4.c
  projects/clangbsd/lib/libc/posix1e/acl_valid.c
  projects/clangbsd/lib/libc/sys/flock.2
  projects/clangbsd/lib/libc/sys/getitimer.2
  projects/clangbsd/lib/libc/sys/getrusage.2
  projects/clangbsd/lib/libc/sys/mq_close.2
  projects/clangbsd/lib/libc/sys/mq_getattr.2
  projects/clangbsd/lib/libc/sys/mq_notify.2
  projects/clangbsd/lib/libc/sys/mq_open.2
  projects/clangbsd/lib/libc/sys/mq_receive.2
  projects/clangbsd/lib/libc/sys/mq_send.2
  projects/clangbsd/lib/libc/sys/mq_setattr.2
  projects/clangbsd/lib/libgssapi/gss_compare_name.3
  projects/clangbsd/lib/libpmc/pmc.corei7.3
  projects/clangbsd/lib/libpmc/pmc.corei7uc.3
  projects/clangbsd/lib/libpmc/pmc.ucf.3
  projects/clangbsd/lib/libpmc/pmc.westmereuc.3
  projects/clangbsd/lib/libpmc/pmclog.c
  projects/clangbsd/lib/librpcsec_gss/rpc_gss_seccreate.3
  projects/clangbsd/lib/msun/man/atan2.3
  projects/clangbsd/lib/msun/man/remainder.3
  projects/clangbsd/libexec/rbootd/rbootd.8
  projects/clangbsd/libexec/rtld-elf/rtld.c
  projects/clangbsd/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  projects/clangbsd/sbin/geom/class/part/geom_part.c
  projects/clangbsd/sbin/geom/class/part/gpart.8
  projects/clangbsd/sbin/geom/misc/subr.c
  projects/clangbsd/share/man/man1/builtin.1
  projects/clangbsd/share/man/man4/Makefile
  projects/clangbsd/share/man/man4/acpi.4
  projects/clangbsd/share/man/man4/ae.4
  projects/clangbsd/share/man/man4/io.4
  projects/clangbsd/share/man/man4/mpt.4
  projects/clangbsd/share/man/man4/textdump.4
  projects/clangbsd/share/man/man5/a.out.5
  projects/clangbsd/share/man/man5/src.conf.5
  projects/clangbsd/share/man/man5/stab.5
  projects/clangbsd/share/man/man9/bus_generic_new_pass.9
  projects/clangbsd/share/man/man9/bus_set_pass.9
  projects/clangbsd/share/man/man9/insmntque.9
  projects/clangbsd/share/man/man9/make_dev.9
  projects/clangbsd/share/man/man9/vfs_mountedfrom.9
  projects/clangbsd/share/misc/committers-src.dot
  projects/clangbsd/share/mk/bsd.own.mk
  projects/clangbsd/share/mk/sys.mk
  projects/clangbsd/share/termcap/termcap.5
  projects/clangbsd/sys/amd64/acpica/acpi_wakeup.c
  projects/clangbsd/sys/amd64/amd64/cpu_switch.S
  projects/clangbsd/sys/amd64/amd64/fpu.c
  projects/clangbsd/sys/amd64/amd64/machdep.c
  projects/clangbsd/sys/amd64/amd64/mp_machdep.c
  projects/clangbsd/sys/amd64/amd64/pmap.c
  projects/clangbsd/sys/amd64/amd64/trap.c
  projects/clangbsd/sys/amd64/amd64/vm_machdep.c
  projects/clangbsd/sys/amd64/ia32/ia32_reg.c
  projects/clangbsd/sys/amd64/include/fpu.h
  projects/clangbsd/sys/amd64/include/pcb.h
  projects/clangbsd/sys/amd64/linux32/linux32_machdep.c
  projects/clangbsd/sys/arm/arm/pmap.c
  projects/clangbsd/sys/boot/pc98/boot0/Makefile
  projects/clangbsd/sys/boot/sparc64/boot1/Makefile
  projects/clangbsd/sys/cam/ata/ata_pmp.c
  projects/clangbsd/sys/cam/ata/ata_xpt.c
  projects/clangbsd/sys/cam/cam_debug.h
  projects/clangbsd/sys/cam/cam_periph.c
  projects/clangbsd/sys/cam/cam_xpt.c
  projects/clangbsd/sys/cam/cam_xpt_internal.h
  projects/clangbsd/sys/cam/scsi/scsi_all.c
  projects/clangbsd/sys/cam/scsi/scsi_all.h
  projects/clangbsd/sys/cam/scsi/scsi_cd.c
  projects/clangbsd/sys/cam/scsi/scsi_ch.h
  projects/clangbsd/sys/cam/scsi/scsi_da.c
  projects/clangbsd/sys/cam/scsi/scsi_xpt.c
  projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/clangbsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/clangbsd/sys/conf/NOTES
  projects/clangbsd/sys/conf/files
  projects/clangbsd/sys/conf/files.amd64
  projects/clangbsd/sys/conf/files.i386
  projects/clangbsd/sys/conf/files.pc98
  projects/clangbsd/sys/conf/files.powerpc
  projects/clangbsd/sys/conf/options
  projects/clangbsd/sys/contrib/libfdt/libfdt_env.h
  projects/clangbsd/sys/crypto/via/padlock.c
  projects/clangbsd/sys/crypto/via/padlock.h
  projects/clangbsd/sys/crypto/via/padlock_cipher.c
  projects/clangbsd/sys/crypto/via/padlock_hash.c
  projects/clangbsd/sys/dev/acpica/acpi.c
  projects/clangbsd/sys/dev/acpica/acpi_ec.c
  projects/clangbsd/sys/dev/ahci/ahci.c
  projects/clangbsd/sys/dev/ata/ata-all.h
  projects/clangbsd/sys/dev/ata/ata-lowlevel.c
  projects/clangbsd/sys/dev/ata/atapi-cam.c
  projects/clangbsd/sys/dev/ata/chipsets/ata-acerlabs.c
  projects/clangbsd/sys/dev/ata/chipsets/ata-intel.c
  projects/clangbsd/sys/dev/ata/chipsets/ata-serverworks.c
  projects/clangbsd/sys/dev/ath/ath_hal/ah.h
  projects/clangbsd/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
  projects/clangbsd/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
  projects/clangbsd/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  projects/clangbsd/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  projects/clangbsd/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
  projects/clangbsd/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  projects/clangbsd/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
  projects/clangbsd/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c
  projects/clangbsd/sys/dev/bge/if_bge.c
  projects/clangbsd/sys/dev/bge/if_bgereg.h
  projects/clangbsd/sys/dev/cas/if_cas.c
  projects/clangbsd/sys/dev/cxgb/cxgb_main.c
  projects/clangbsd/sys/dev/hwpmc/hwpmc_mod.c
  projects/clangbsd/sys/dev/iicbus/iic.h
  projects/clangbsd/sys/dev/isp/isp.c
  projects/clangbsd/sys/dev/isp/isp_freebsd.c
  projects/clangbsd/sys/dev/isp/isp_library.c
  projects/clangbsd/sys/dev/isp/isp_pci.c
  projects/clangbsd/sys/dev/ixgbe/ixgbe.c
  projects/clangbsd/sys/dev/ixgbe/ixgbe.h
  projects/clangbsd/sys/dev/mvs/mvs.c
  projects/clangbsd/sys/dev/random/nehemiah.c
  projects/clangbsd/sys/dev/sge/if_sge.c
  projects/clangbsd/sys/dev/siis/siis.c
  projects/clangbsd/sys/dev/sound/pci/hda/hdac.c
  projects/clangbsd/sys/dev/twa/tw_cl.h
  projects/clangbsd/sys/dev/twa/tw_cl_fwif.h
  projects/clangbsd/sys/dev/twa/tw_cl_init.c
  projects/clangbsd/sys/dev/twa/tw_cl_intr.c
  projects/clangbsd/sys/dev/twa/tw_cl_io.c
  projects/clangbsd/sys/dev/twa/tw_cl_misc.c
  projects/clangbsd/sys/dev/twa/tw_cl_share.h
  projects/clangbsd/sys/dev/twa/tw_osl.h
  projects/clangbsd/sys/dev/twa/tw_osl_cam.c
  projects/clangbsd/sys/dev/twa/tw_osl_externs.h
  projects/clangbsd/sys/dev/twa/tw_osl_freebsd.c
  projects/clangbsd/sys/dev/twa/tw_osl_inline.h
  projects/clangbsd/sys/dev/twa/tw_osl_share.h
  projects/clangbsd/sys/dev/xen/netfront/netfront.c
  projects/clangbsd/sys/fs/devfs/devfs.h
  projects/clangbsd/sys/fs/devfs/devfs_devs.c
  projects/clangbsd/sys/fs/devfs/devfs_vnops.c
  projects/clangbsd/sys/geom/geom_event.c
  projects/clangbsd/sys/geom/geom_io.c
  projects/clangbsd/sys/geom/mountver/g_mountver.c
  projects/clangbsd/sys/geom/part/g_part_bsd.c
  projects/clangbsd/sys/geom/part/g_part_gpt.c
  projects/clangbsd/sys/i386/i386/machdep.c
  projects/clangbsd/sys/i386/i386/pmap.c
  projects/clangbsd/sys/i386/i386/ptrace_machdep.c
  projects/clangbsd/sys/i386/i386/swtch.s
  projects/clangbsd/sys/i386/i386/trap.c
  projects/clangbsd/sys/i386/i386/vm_machdep.c
  projects/clangbsd/sys/i386/include/npx.h
  projects/clangbsd/sys/i386/include/pcb.h
  projects/clangbsd/sys/i386/include/pcpu.h
  projects/clangbsd/sys/i386/isa/npx.c
  projects/clangbsd/sys/i386/linux/linux_machdep.c
  projects/clangbsd/sys/i386/linux/linux_ptrace.c
  projects/clangbsd/sys/i386/xen/pmap.c
  projects/clangbsd/sys/ia64/ia64/busdma_machdep.c
  projects/clangbsd/sys/ia64/ia64/pmap.c
  projects/clangbsd/sys/ia64/ia64/vm_machdep.c
  projects/clangbsd/sys/ia64/include/md_var.h
  projects/clangbsd/sys/kern/kern_intr.c
  projects/clangbsd/sys/kern/kern_jail.c
  projects/clangbsd/sys/kern/kern_sx.c
  projects/clangbsd/sys/kern/posix4_mib.c
  projects/clangbsd/sys/kern/sched_4bsd.c
  projects/clangbsd/sys/kern/sched_ule.c
  projects/clangbsd/sys/kern/subr_acl_nfs4.c
  projects/clangbsd/sys/kern/subr_acl_posix1e.c
  projects/clangbsd/sys/kern/subr_bus.c
  projects/clangbsd/sys/kern/subr_taskqueue.c
  projects/clangbsd/sys/kern/sysv_sem.c
  projects/clangbsd/sys/kern/sysv_shm.c
  projects/clangbsd/sys/kern/uipc_sem.c
  projects/clangbsd/sys/kern/uipc_shm.c
  projects/clangbsd/sys/kern/vfs_acl.c
  projects/clangbsd/sys/kern/vfs_bio.c
  projects/clangbsd/sys/kern/vfs_subr.c
  projects/clangbsd/sys/mips/mips/pmap.c
  projects/clangbsd/sys/modules/netgraph/Makefile
  projects/clangbsd/sys/modules/zfs/Makefile
  projects/clangbsd/sys/net/vnet.h
  projects/clangbsd/sys/net80211/ieee80211_hwmp.c
  projects/clangbsd/sys/net80211/ieee80211_ioctl.c
  projects/clangbsd/sys/net80211/ieee80211_scan_sta.c
  projects/clangbsd/sys/net80211/ieee80211_sta.c
  projects/clangbsd/sys/netgraph/ng_pppoe.c
  projects/clangbsd/sys/netinet/ip_mroute.c
  projects/clangbsd/sys/netinet/ip_mroute.h
  projects/clangbsd/sys/netinet/pim_var.h
  projects/clangbsd/sys/netinet/sctp_auth.c
  projects/clangbsd/sys/netinet/sctp_bsd_addr.c
  projects/clangbsd/sys/netinet/sctp_constants.h
  projects/clangbsd/sys/netinet/sctp_indata.c
  projects/clangbsd/sys/netinet/sctp_input.c
  projects/clangbsd/sys/netinet/sctp_lock_bsd.h
  projects/clangbsd/sys/netinet/sctp_output.c
  projects/clangbsd/sys/netinet/sctp_pcb.c
  projects/clangbsd/sys/netinet/sctp_pcb.h
  projects/clangbsd/sys/netinet/sctp_sysctl.c
  projects/clangbsd/sys/netinet/sctp_usrreq.c
  projects/clangbsd/sys/netinet/sctputil.c
  projects/clangbsd/sys/opencrypto/crypto.c
  projects/clangbsd/sys/pc98/pc98/machdep.c
  projects/clangbsd/sys/powerpc/aim/mmu_oea.c
  projects/clangbsd/sys/powerpc/aim/mmu_oea64.c
  projects/clangbsd/sys/powerpc/booke/pmap.c
  projects/clangbsd/sys/powerpc/powermac/kiic.c
  projects/clangbsd/sys/powerpc/powermac/macgpio.c
  projects/clangbsd/sys/powerpc/powermac/smu.c
  projects/clangbsd/sys/powerpc/powermac/uninorth.c
  projects/clangbsd/sys/powerpc/powerpc/intr_machdep.c
  projects/clangbsd/sys/sparc64/sparc64/pmap.c
  projects/clangbsd/sys/sun4v/sun4v/pmap.c
  projects/clangbsd/sys/sys/_task.h
  projects/clangbsd/sys/sys/libkern.h
  projects/clangbsd/sys/sys/nlist_aout.h
  projects/clangbsd/sys/sys/param.h
  projects/clangbsd/sys/sys/pmc.h
  projects/clangbsd/sys/sys/posix4.h
  projects/clangbsd/sys/sys/proc.h
  projects/clangbsd/sys/sys/vtoc.h
  projects/clangbsd/sys/ufs/ufs/ufs_quota.c
  projects/clangbsd/sys/vm/vm_contig.c
  projects/clangbsd/sys/vm/vm_page.c
  projects/clangbsd/sys/vm/vm_page.h
  projects/clangbsd/sys/vm/vm_pageout.c
  projects/clangbsd/sys/vm/vm_pageout.h
  projects/clangbsd/sys/vm/vnode_pager.c
  projects/clangbsd/tools/regression/fstest/Makefile
  projects/clangbsd/tools/regression/usr.bin/jot/regress.sh
  projects/clangbsd/tools/tools/netrate/tcpp/README
  projects/clangbsd/tools/tools/netrate/tcpp/tcpp.c
  projects/clangbsd/tools/tools/netrate/tcpp/tcpp.h
  projects/clangbsd/tools/tools/netrate/tcpp/tcpp_client.c
  projects/clangbsd/tools/tools/netrate/tcpp/tcpp_server.c
  projects/clangbsd/usr.bin/bc/scan.l
  projects/clangbsd/usr.bin/calendar/calendars/calendar.freebsd
  projects/clangbsd/usr.bin/calendar/io.c
  projects/clangbsd/usr.bin/calendar/locale.c
  projects/clangbsd/usr.bin/calendar/sunpos.c
  projects/clangbsd/usr.bin/dc/bcode.c
  projects/clangbsd/usr.bin/dc/dc.c
  projects/clangbsd/usr.bin/gzip/gzip.c
  projects/clangbsd/usr.bin/hexdump/od.1
  projects/clangbsd/usr.bin/ipcs/ipc.c
  projects/clangbsd/usr.bin/join/join.1
  projects/clangbsd/usr.bin/jot/jot.1
  projects/clangbsd/usr.bin/jot/jot.c
  projects/clangbsd/usr.bin/newkey/newkey.8
  projects/clangbsd/usr.bin/unzip/unzip.c
  projects/clangbsd/usr.sbin/chown/chown.c
  projects/clangbsd/usr.sbin/nfscbd/nfscbd.8
  projects/clangbsd/usr.sbin/nfsdumpstate/nfsdumpstate.8
  projects/clangbsd/usr.sbin/pmcstat/pmcpl_calltree.c
  projects/clangbsd/usr.sbin/pmcstat/pmcstat.c
  projects/clangbsd/usr.sbin/pmcstat/pmcstat_log.c
  projects/clangbsd/usr.sbin/service/service.8
  projects/clangbsd/usr.sbin/sysinstall/tcpip.c
  projects/clangbsd/usr.sbin/timed/timed/timed.8
  projects/clangbsd/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  projects/clangbsd/   (props changed)
  projects/clangbsd/cddl/contrib/opensolaris/   (props changed)
  projects/clangbsd/contrib/bind9/   (props changed)
  projects/clangbsd/contrib/ee/   (props changed)
  projects/clangbsd/contrib/expat/   (props changed)
  projects/clangbsd/contrib/file/   (props changed)
  projects/clangbsd/contrib/gdb/   (props changed)
  projects/clangbsd/contrib/gdtoa/   (props changed)
  projects/clangbsd/contrib/gnu-sort/   (props changed)
  projects/clangbsd/contrib/groff/   (props changed)
  projects/clangbsd/contrib/less/   (props changed)
  projects/clangbsd/contrib/libpcap/   (props changed)
  projects/clangbsd/contrib/llvm/   (props changed)
  projects/clangbsd/contrib/llvm/tools/clang/   (props changed)
  projects/clangbsd/contrib/ncurses/   (props changed)
  projects/clangbsd/contrib/netcat/   (props changed)
  projects/clangbsd/contrib/ntp/   (props changed)
  projects/clangbsd/contrib/one-true-awk/   (props changed)
  projects/clangbsd/contrib/openbsm/   (props changed)
  projects/clangbsd/contrib/openpam/   (props changed)
  projects/clangbsd/contrib/pf/   (props changed)
  projects/clangbsd/contrib/sendmail/   (props changed)
  projects/clangbsd/contrib/tcpdump/   (props changed)
  projects/clangbsd/contrib/tcsh/   (props changed)
  projects/clangbsd/contrib/top/   (props changed)
  projects/clangbsd/contrib/top/install-sh   (props changed)
  projects/clangbsd/contrib/tzcode/stdtime/   (props changed)
  projects/clangbsd/contrib/tzcode/zic/   (props changed)
  projects/clangbsd/contrib/tzdata/   (props changed)
  projects/clangbsd/contrib/wpa/   (props changed)
  projects/clangbsd/crypto/openssh/   (props changed)
  projects/clangbsd/crypto/openssl/   (props changed)
  projects/clangbsd/lib/libc/   (props changed)
  projects/clangbsd/lib/libc/stdtime/   (props changed)
  projects/clangbsd/lib/libutil/   (props changed)
  projects/clangbsd/lib/libz/   (props changed)
  projects/clangbsd/sbin/   (props changed)
  projects/clangbsd/sbin/ipfw/   (props changed)
  projects/clangbsd/share/zoneinfo/   (props changed)
  projects/clangbsd/sys/   (props changed)
  projects/clangbsd/sys/amd64/include/xen/   (props changed)
  projects/clangbsd/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clangbsd/sys/contrib/dev/acpica/   (props changed)
  projects/clangbsd/sys/contrib/pf/   (props changed)
  projects/clangbsd/sys/contrib/x86emu/   (props changed)
  projects/clangbsd/sys/dev/xen/xenpci/   (props changed)
  projects/clangbsd/usr.bin/csup/   (props changed)
  projects/clangbsd/usr.bin/procstat/   (props changed)
  projects/clangbsd/usr.sbin/zic/   (props changed)

Modified: projects/clangbsd/Makefile.inc1
==============================================================================

--- projects/clangbsd/Makefile.inc1	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/Makefile.inc1	Fri Jun 11 13:10:32 2010	(r209040)
@@ -967,12 +967,12 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptre
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${MK_CLANG} != "no"
+# XXX: There is no way to specify bootstrap tools depending on MK-flags
+# with different per-architecture default values. Always build tblgen.
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmsystem \
 	usr.bin/clang/tblgen
-.endif
 
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \

Modified: projects/clangbsd/bin/chio/chio.c
==============================================================================
--- projects/clangbsd/bin/chio/chio.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/chio/chio.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -1072,6 +1072,7 @@ find_element(char *voltag, uint16_t *et,
 
 	/* 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;

Modified: projects/clangbsd/bin/cp/cp.c
==============================================================================
--- projects/clangbsd/bin/cp/cp.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/cp/cp.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -466,6 +466,7 @@ copy(char *argv[], enum op type, int fts
 		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))

Modified: projects/clangbsd/bin/date/date.1
==============================================================================
--- projects/clangbsd/bin/date/date.1	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/date/date.1	Fri Jun 11 13:10:32 2010	(r209040)
@@ -32,7 +32,7 @@
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd June 2, 2007
+.Dd June 3, 2010
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -219,6 +219,14 @@ When the date is adjusted to a specific 
 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 @@ will display the last day of February in
 .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

Modified: projects/clangbsd/bin/getfacl/getfacl.1
==============================================================================
--- projects/clangbsd/bin/getfacl/getfacl.1	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/getfacl/getfacl.1	Fri Jun 11 13:10:32 2010	(r209040)
@@ -48,7 +48,7 @@ the specified file(s) to standard output
 If the
 .Xr getconf 1
 utility indicates that
-.Eq { } Va _POSIX_ACL_EXTENDED
+.Brq Va _POSIX_ACL_EXTENDED
 is not in effect for a
 .Ar file
 then the standard discretionary access permissions are interpreted as

Modified: projects/clangbsd/bin/sh/histedit.c
==============================================================================
--- projects/clangbsd/bin/sh/histedit.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/sh/histedit.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -98,6 +98,8 @@ histedit(void)
 			/*
 			 * turn editing on
 			 */
+			char *term;
+
 			INTOFF;
 			if (el_in == NULL)
 				el_in = fdopen(0, "r");
@@ -107,6 +109,11 @@ histedit(void)
 				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 @@ sethistsize(hs)
 	}
 }
 
+void
+setterm(const char *term)
+{
+	if (rootshell && el != NULL && term != NULL)
+		el_set(el, EL_TERMINAL, term);
+}
+
 int
 histcmd(int argc, char **argv)
 {

Modified: projects/clangbsd/bin/sh/jobs.c
==============================================================================
--- projects/clangbsd/bin/sh/jobs.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/sh/jobs.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -866,6 +866,7 @@ waitforjob(struct job *jp, int *origstat
 {
 #if JOBS
 	pid_t mypgrp = getpgrp();
+	int propagate_int = jp->jobctl && jp->foreground;
 #endif
 	int status;
 	int st;
@@ -903,6 +904,11 @@ waitforjob(struct job *jp, int *origstat
 		else
 			CLEAR_PENDING_INT;
 	}
+#if JOBS
+	else if (rootshell && iflag && propagate_int &&
+			WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
+		kill(getpid(), SIGINT);
+#endif
 	INTON;
 	return st;
 }

Modified: projects/clangbsd/bin/sh/myhistedit.h
==============================================================================
--- projects/clangbsd/bin/sh/myhistedit.h	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/sh/myhistedit.h	Fri Jun 11 13:10:32 2010	(r209040)
@@ -38,6 +38,7 @@ extern int displayhist;
 
 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);

Modified: projects/clangbsd/bin/sh/var.c
==============================================================================
--- projects/clangbsd/bin/sh/var.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/sh/var.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -80,6 +80,7 @@ struct varinit {
 
 #ifndef NO_HISTORY
 struct var vhistsize;
+struct var vterm;
 #endif
 struct var vifs;
 struct var vmail;
@@ -114,6 +115,10 @@ STATIC const struct varinit varinit[] = 
 	  NULL },
 	{ &vps4,	0,				"PS4=+ ",
 	  NULL },
+#ifndef NO_HISTORY
+	{ &vterm,	VUNSET,				"TERM=",
+	  setterm },
+#endif
 	{ &voptind,	0,				"OPTIND=1",
 	  getoptsreset },
 	{ NULL,	0,				NULL,

Modified: projects/clangbsd/bin/sh/var.h
==============================================================================
--- projects/clangbsd/bin/sh/var.h	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/bin/sh/var.h	Fri Jun 11 13:10:32 2010	(r209040)
@@ -77,6 +77,7 @@ extern struct var vps2;
 extern struct var vps4;
 #ifndef NO_HISTORY
 extern struct var vhistsize;
+extern struct var vterm;
 #endif
 
 /*
@@ -96,6 +97,7 @@ extern struct var vhistsize;
 #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)

Modified: projects/clangbsd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
==============================================================================
--- projects/clangbsd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Fri Jun 11 13:10:32 2010	(r209040)
@@ -811,7 +811,8 @@ id_or_type(const char *s)
 			longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
 	}
 
-	unput(c0);
+	if (c0 != EOF)
+		unput(c0);
 	return (ttok);
 }
 

Modified: projects/clangbsd/contrib/binutils/bfd/archures.c
==============================================================================
--- projects/clangbsd/contrib/binutils/bfd/archures.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/contrib/binutils/bfd/archures.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -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 @@ DESCRIPTION
 .#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

Modified: projects/clangbsd/contrib/binutils/bfd/bfd-in2.h
==============================================================================
--- projects/clangbsd/contrib/binutils/bfd/bfd-in2.h	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/contrib/binutils/bfd/bfd-in2.h	Fri Jun 11 13:10:32 2010	(r209040)
@@ -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__

Modified: projects/clangbsd/contrib/binutils/bfd/cpu-mips.c
==============================================================================
--- projects/clangbsd/contrib/binutils/bfd/cpu-mips.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/contrib/binutils/bfd/cpu-mips.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -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 @@ GNU General Public License for more deta
 
 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 @@ enum
   I_mips6000,
   I_mips7000,
   I_mips8000,
+  I_mips9000,
   I_mips10000,
   I_mips12000,
   I_mips16,
@@ -84,6 +85,7 @@ enum
   I_mipsisa32r2,
   I_mipsisa64,
   I_mipsisa64r2,
+  I_mipsocteon,
   I_sb1,
 };
 
@@ -108,6 +110,7 @@ static const bfd_arch_info_type arch_inf
   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 @@ static const bfd_arch_info_type arch_inf
   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),
 };
 

Modified: projects/clangbsd/contrib/binutils/bfd/elfxx-mips.c
==============================================================================
--- projects/clangbsd/contrib/binutils/bfd/elfxx-mips.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/contrib/binutils/bfd/elfxx-mips.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -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 @@ _bfd_elf_mips_mach (flagword flags)
     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 @@ mips_set_isa_flags (bfd *abfd)
       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 @@ mips_set_isa_flags (bfd *abfd)
       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 @@ struct mips_mach_extension {
    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 @@ static const struct mips_mach_extension 
   { 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 @@ mips_mach_extends_p (unsigned long base,
 {
   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;
 }
 
 

Modified: projects/clangbsd/contrib/binutils/gas/config/tc-mips.c
==============================================================================
--- projects/clangbsd/contrib/binutils/gas/config/tc-mips.c	Fri Jun 11 12:58:29 2010	(r209039)
+++ projects/clangbsd/contrib/binutils/gas/config/tc-mips.c	Fri Jun 11 13:10:32 2010	(r209040)
@@ -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 = FALSE;
 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 @@ static char *mips_regmask_frag;
 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 @@ extern int target_big_endian;
 			    ? ".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 @@ static enum mips_abi_level mips_abi = NO
 /* 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 @@ struct mips_set_options
      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 @@ struct mips_set_options
   /* 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 int file_mips_fp32 = -1;
 
 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
 };
 
 /* These variables are filled in with the masks of registers used.
@@ -225,6 +288,14 @@ static int file_ase_mips3d;
    command line (e.g., by -march).  */
 static int file_ase_mdmx;
 
+/* True if -mdsp was passed or implied by arguments passed on the
+   command line (e.g., by -march).  */
+static int file_ase_dsp;
+
+/* True if -mmt was passed or implied by arguments passed on the
+   command line (e.g., by -march).  */
+static int file_ase_mt;
+
 /* The argument of the -march= flag.  The architecture we are assembling.  */
 static int file_mips_arch = CPU_UNKNOWN;
 static const char *mips_arch_string;
@@ -268,6 +339,12 @@ static int mips_32bitmode = 0;
    || (ISA) == ISA_MIPS64R2	\
    )
 
+/* Return true if ISA supports ins instructions. */
+#define ISA_HAS_INS(ISA) ( \
+  (ISA) == ISA_MIPS32R2    \
+  || (ISA) == ISA_MIPS64R2 \
+  )
+
 #define HAVE_32BIT_GPRS		                   \
     (mips_opts.gp32 || ! ISA_HAS_64BIT_REGS (mips_opts.isa))
 
@@ -284,15 +361,16 @@ static int mips_32bitmode = 0;
 /* True if relocations are stored in-place.  */
 #define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI)
 
-/* We can only have 64bit addresses if the object file format
-   supports it.  */
-#define HAVE_32BIT_ADDRESSES                           \
-   (HAVE_32BIT_GPRS                                    \
-    || ((bfd_arch_bits_per_address (stdoutput) == 32   \
-         || ! HAVE_64BIT_OBJECTS)                      \
-        && mips_pic != EMBEDDED_PIC))
-
-#define HAVE_64BIT_ADDRESSES (! HAVE_32BIT_ADDRESSES)
+/* The ABI-derived address size.  */
+#define HAVE_64BIT_ADDRESSES \
+  (HAVE_64BIT_GPRS && (mips_abi == EABI_ABI || mips_abi == N64_ABI))
+#define HAVE_32BIT_ADDRESSES (!HAVE_64BIT_ADDRESSES)
+
+/* The size of symbolic constants (i.e., expressions of the form
+   "SYMBOL" or "SYMBOL + OFFSET").  */
+#define HAVE_32BIT_SYMBOLS \
+  (HAVE_32BIT_ADDRESSES || !HAVE_64BIT_OBJECTS || mips_opts.sym32)
+#define HAVE_64BIT_SYMBOLS (!HAVE_32BIT_SYMBOLS)
 
 /* Addresses are loaded in different ways, depending on the address size
    in use.  The n32 ABI Documentation also mandates the use of additions
@@ -322,6 +400,14 @@ static int mips_32bitmode = 0;
 #define CPU_HAS_MDMX(cpu)	(FALSE                 \
 				 )
 
+/* Return true if the given CPU supports the DSP ASE.  */
+#define CPU_HAS_DSP(cpu)	(FALSE                 \
+				 )
+
+/* Return true if the given CPU supports the MT ASE.  */
+#define CPU_HAS_MT(cpu)		(FALSE                 \
+				 )
+
 /* True if CPU has a dror instruction.  */
 #define CPU_HAS_DROR(CPU)	((CPU) == CPU_VR5400 || (CPU) == CPU_VR5500)
 
@@ -349,7 +435,6 @@ static int mips_32bitmode = 0;
    || mips_opts.arch == CPU_R10000                    \
    || mips_opts.arch == CPU_R12000                    \
    || mips_opts.arch == CPU_RM7000                    \
-   || mips_opts.arch == CPU_SB1                       \
    || mips_opts.arch == CPU_VR5500                    \
    )
 
@@ -360,8 +445,6 @@ static int mips_32bitmode = 0;
    level I.  */
 #define gpr_interlocks \
   (mips_opts.isa != ISA_MIPS1  \
-   || mips_opts.arch == CPU_VR5400  \
-   || mips_opts.arch == CPU_VR5500  \
    || mips_opts.arch == CPU_R3900)
 
 /* Whether the processor uses hardware interlocks to avoid delays
@@ -377,9 +460,6 @@ static int mips_32bitmode = 0;
     && mips_opts.isa != ISA_MIPS2                     \
     && mips_opts.isa != ISA_MIPS3)                    \
    || mips_opts.arch == CPU_R4300                     \
-   || mips_opts.arch == CPU_VR5400                    \
-   || mips_opts.arch == CPU_VR5500                    \
-   || mips_opts.arch == CPU_SB1                       \
    )
 
 /* Whether the processor uses hardware interlocks to protect reads
@@ -521,44 +601,27 @@ static int mips_optimize = 2;
    equivalent to seeing no -g option at all.  */
 static int mips_debug = 0;
 
-/* The previous instruction.  */
-static struct mips_cl_insn prev_insn;
-
-/* The instruction before prev_insn.  */
-static struct mips_cl_insn prev_prev_insn;
+/* The maximum number of NOPs needed to avoid the VR4130 mflo/mfhi errata.  */
+#define MAX_VR4130_NOPS 4
 
-/* If we don't want information for prev_insn or prev_prev_insn, we
-   point the insn_mo field at this dummy integer.  */
-static const struct mips_opcode dummy_opcode = { NULL, NULL, 0, 0, 0, 0 };
+/* The maximum number of NOPs needed to fill delay slots.  */
+#define MAX_DELAY_NOPS 2
 
-/* Non-zero if prev_insn is valid.  */
-static int prev_insn_valid;
+/* The maximum number of NOPs needed for any purpose.  */
+#define MAX_NOPS 4
 
-/* The frag for the previous instruction.  */
-static struct frag *prev_insn_frag;
+/* A list of previous instructions, with index 0 being the most recent.
+   We need to look back MAX_NOPS instructions when filling delay slots
+   or working around processor errata.  We need to look back one
+   instruction further if we're thinking about using history[0] to
+   fill a branch delay slot.  */
+static struct mips_cl_insn history[1 + MAX_NOPS];
 
-/* The offset into prev_insn_frag for the previous instruction.  */
-static long prev_insn_where;
+/* Nop instructions used by emit_nop.  */
+static struct mips_cl_insn nop_insn, mips16_nop_insn;
 
-/* The reloc type for the previous instruction, if any.  */
-static bfd_reloc_code_real_type prev_insn_reloc_type[3];
-
-/* The reloc for the previous instruction, if any.  */
-static fixS *prev_insn_fixp[3];
-
-/* Non-zero if the previous instruction was in a delay slot.  */
-static int prev_insn_is_delay_slot;
-
-/* Non-zero if the previous instruction was in a .set noreorder.  */
-static int prev_insn_unreordered;
-
-/* Non-zero if the previous instruction uses an extend opcode (if
-   mips16).  */
-static int prev_insn_extended;
-
-/* Non-zero if the previous previous instruction was in a .set
-   noreorder.  */
-static int prev_prev_insn_unreordered;
+/* The appropriate nop for the current mode.  */
+#define NOP_INSN (mips_opts.mips16 ? &mips16_nop_insn : &nop_insn)
 
 /* If this is set, it points to a frag holding nop instructions which
    were inserted before the start of a noreorder section.  If those
@@ -625,8 +688,29 @@ static const unsigned int mips16_to_32_r
   16, 17, 2, 3, 4, 5, 6, 7
 };
 
+/* Classifies the kind of instructions we're interested in when
+   implementing -mfix-vr4120.  */
+enum fix_vr4120_class {
+  FIX_VR4120_MACC,
+  FIX_VR4120_DMACC,
+  FIX_VR4120_MULT,
+  FIX_VR4120_DMULT,
+  FIX_VR4120_DIV,
+  FIX_VR4120_MTHILO,
+  NUM_FIX_VR4120_CLASSES
+};
+
+/* Given two FIX_VR4120_* values X and Y, bit Y of element X is set if
+   there must be at least one other instruction between an instruction
+   of type X and an instruction of type Y.  */
+static unsigned int vr4120_conflicts[NUM_FIX_VR4120_CLASSES];
+
+/* True if -mfix-vr4120 is in force.  */
 static int mips_fix_vr4120;
 
+/* ...likewise -mfix-vr4130.  */
+static int mips_fix_vr4130;
+
 /* We don't relax branches by default, since this causes us to expand
    `la .l2 - .l1' if there's a branch between .l1 and .l2, because we
    fail to compute the offset before expanding the macro to the most
@@ -820,6 +904,41 @@ static int mips_relax_branch;
   (((x) &~ (offsetT) 0x7fff) == 0					\
    || (((x) &~ (offsetT) 0x7fff) == ~ (offsetT) 0x7fff))
 
+/* Is the given value a zero-extended 32-bit value?  Or a negated one?  */
+#define IS_ZEXT_32BIT_NUM(x)						\
+  (((x) &~ (offsetT) 0xffffffff) == 0					\
+   || (((x) &~ (offsetT) 0xffffffff) == ~ (offsetT) 0xffffffff))
+
+/* Replace bits MASK << SHIFT of STRUCT with the equivalent bits in
+   VALUE << SHIFT.  VALUE is evaluated exactly once.  */
+#define INSERT_BITS(STRUCT, VALUE, MASK, SHIFT) \
+  (STRUCT) = (((STRUCT) & ~((MASK) << (SHIFT))) \
+	      | (((VALUE) & (MASK)) << (SHIFT)))
+
+/* Extract bits MASK << SHIFT from STRUCT and shift them right
+   SHIFT places.  */
+#define EXTRACT_BITS(STRUCT, MASK, SHIFT) \
+  (((STRUCT) >> (SHIFT)) & (MASK))
+
+/* Change INSN's opcode so that the operand given by FIELD has value VALUE.
+   INSN is a mips_cl_insn structure and VALUE is evaluated exactly once.
+
+   include/opcode/mips.h specifies operand fields using the macros
+   OP_MASK_<FIELD> and OP_SH_<FIELD>.  The MIPS16 equivalents start
+   with "MIPS16OP" instead of "OP".  */
+#define INSERT_OPERAND(FIELD, INSN, VALUE) \
+  INSERT_BITS ((INSN).insn_opcode, VALUE, OP_MASK_##FIELD, OP_SH_##FIELD)
+#define MIPS16_INSERT_OPERAND(FIELD, INSN, VALUE) \
+  INSERT_BITS ((INSN).insn_opcode, VALUE, \
+		MIPS16OP_MASK_##FIELD, MIPS16OP_SH_##FIELD)
+
+/* Extract the operand given by FIELD from mips_cl_insn INSN.  */
+#define EXTRACT_OPERAND(FIELD, INSN) \
+  EXTRACT_BITS ((INSN).insn_opcode, OP_MASK_##FIELD, OP_SH_##FIELD)
+#define MIPS16_EXTRACT_OPERAND(FIELD, INSN) \
+  EXTRACT_BITS ((INSN).insn_opcode, \
+		MIPS16OP_MASK_##FIELD, \
+		MIPS16OP_SH_##FIELD)
 
 /* Global variables used when generating relaxable macros.  See the
    comment above RELAX_ENCODE for more details about how relaxation
@@ -866,7 +985,7 @@ enum mips_regclass { MIPS_GR_REG, MIPS_F
 
 static void append_insn
   (struct mips_cl_insn *ip, expressionS *p, bfd_reloc_code_real_type *r);
-static void mips_no_prev_insn (int);
+static void mips_no_prev_insn (void);
 static void mips16_macro_build
   (expressionS *, const char *, const char *, va_list);
 static void load_register (int, expressionS *, int);
@@ -1092,8 +1211,6 @@ mips_target_format (void)
 {
   switch (OUTPUT_FLAVOR)
     {
-    case bfd_target_aout_flavour:
-      return target_big_endian ? "a.out-mips-big" : "a.out-mips-little";
     case bfd_target_ecoff_flavour:
       return target_big_endian ? "ecoff-bigmips" : ECOFF_LITTLE_FORMAT;
     case bfd_target_coff_flavour:
@@ -1127,6 +1244,174 @@ mips_target_format (void)
     }
 }
 
+/* Return the length of instruction INSN.  */
+
+static inline unsigned int
+insn_length (const struct mips_cl_insn *insn)
+{
+  if (!mips_opts.mips16)
+    return 4;
+  return insn->mips16_absolute_jump_p || insn->use_extend ? 4 : 2;
+}
+
+/* Initialise INSN from opcode entry MO.  Leave its position unspecified.  */
+
+static void
+create_insn (struct mips_cl_insn *insn, const struct mips_opcode *mo)
+{
+  size_t i;
+
+  insn->insn_mo = mo;
+  insn->use_extend = FALSE;
+  insn->extend = 0;
+  insn->insn_opcode = mo->match;
+  insn->frag = NULL;
+  insn->where = 0;
+  for (i = 0; i < ARRAY_SIZE (insn->fixp); i++)
+    insn->fixp[i] = NULL;
+  insn->fixed_p = (mips_opts.noreorder > 0);
+  insn->noreorder_p = (mips_opts.noreorder > 0);
+  insn->mips16_absolute_jump_p = 0;
+}
+
+/* Install INSN at the location specified by its "frag" and "where" fields.  */
+
+static void
+install_insn (const struct mips_cl_insn *insn)
+{
+  char *f = insn->frag->fr_literal + insn->where;
+  if (!mips_opts.mips16)
+    md_number_to_chars (f, insn->insn_opcode, 4);
+  else if (insn->mips16_absolute_jump_p)
+    {
+      md_number_to_chars (f, insn->insn_opcode >> 16, 2);
+      md_number_to_chars (f + 2, insn->insn_opcode & 0xffff, 2);
+    }
+  else
+    {
+      if (insn->use_extend)
+	{
+	  md_number_to_chars (f, 0xf000 | insn->extend, 2);
+	  f += 2;
+	}
+      md_number_to_chars (f, insn->insn_opcode, 2);
+    }
+}
+
+/* Move INSN to offset WHERE in FRAG.  Adjust the fixups accordingly
+   and install the opcode in the new location.  */
+
+static void
+move_insn (struct mips_cl_insn *insn, fragS *frag, long where)
+{
+  size_t i;
+
+  insn->frag = frag;
+  insn->where = where;
+  for (i = 0; i < ARRAY_SIZE (insn->fixp); i++)
+    if (insn->fixp[i] != NULL)
+      {
+	insn->fixp[i]->fx_frag = frag;
+	insn->fixp[i]->fx_where = where;
+      }
+  install_insn (insn);
+}
+
+/* Add INSN to the end of the output.  */
+
+static void
+add_fixed_insn (struct mips_cl_insn *insn)
+{
+  char *f = frag_more (insn_length (insn));
+  move_insn (insn, frag_now, f - frag_now->fr_literal);
+}
+
+/* Start a variant frag and move INSN to the start of the variant part,
+   marking it as fixed.  The other arguments are as for frag_var.  */
+
+static void
+add_relaxed_insn (struct mips_cl_insn *insn, int max_chars, int var,
+		  relax_substateT subtype, symbolS *symbol, offsetT offset)
+{
+  frag_grow (max_chars);
+  move_insn (insn, frag_now, frag_more (0) - frag_now->fr_literal);
+  insn->fixed_p = 1;
+  frag_var (rs_machine_dependent, max_chars, var,
+	    subtype, symbol, offset, NULL);
+}
+
+/* Insert N copies of INSN into the history buffer, starting at
+   position FIRST.  Neither FIRST nor N need to be clipped.  */
+
+static void
+insert_into_history (unsigned int first, unsigned int n,
+		     const struct mips_cl_insn *insn)
+{
+  if (mips_relax.sequence != 2)
+    {
+      unsigned int i;
+
+      for (i = ARRAY_SIZE (history); i-- > first;)
+	if (i >= first + n)
+	  history[i] = history[i - n];
+	else
+	  history[i] = *insn;
+    }
+}
+
+/* Emit a nop instruction, recording it in the history buffer.  */
+
+static void
+emit_nop (void)
+{
+  add_fixed_insn (NOP_INSN);
+  insert_into_history (0, 1, NOP_INSN);
+}
+
+/* Initialize vr4120_conflicts.  There is a bit of duplication here:
+   the idea is to make it obvious at a glance that each errata is
+   included.  */
+
+static void
+init_vr4120_conflicts (void)
+{
+#define CONFLICT(FIRST, SECOND) \
+    vr4120_conflicts[FIX_VR4120_##FIRST] |= 1 << FIX_VR4120_##SECOND
+
+  /* Errata 21 - [D]DIV[U] after [D]MACC */
+  CONFLICT (MACC, DIV);
+  CONFLICT (DMACC, DIV);
+
+  /* Errata 23 - Continuous DMULT[U]/DMACC instructions.  */
+  CONFLICT (DMULT, DMULT);
+  CONFLICT (DMULT, DMACC);
+  CONFLICT (DMACC, DMULT);
+  CONFLICT (DMACC, DMACC);
+
+  /* Errata 24 - MT{LO,HI} after [D]MACC */
+  CONFLICT (MACC, MTHILO);
+  CONFLICT (DMACC, MTHILO);
+
+  /* VR4181A errata MD(1): "If a MULT, MULTU, DMULT or DMULTU
+     instruction is executed immediately after a MACC or DMACC
+     instruction, the result of [either instruction] is incorrect."  */
+  CONFLICT (MACC, MULT);
+  CONFLICT (MACC, DMULT);
+  CONFLICT (DMACC, MULT);
+  CONFLICT (DMACC, DMULT);
+
+  /* VR4181A errata MD(4): "If a MACC or DMACC instruction is
+     executed immediately after a DMULT, DMULTU, DIV, DIVU,
+     DDIV or DDIVU instruction, the result of the MACC or
+     DMACC instruction is incorrect.".  */
+  CONFLICT (DMULT, MACC);
+  CONFLICT (DMULT, DMACC);
+  CONFLICT (DIV, MACC);
+  CONFLICT (DIV, DMACC);
+
+#undef CONFLICT
+}
+
 /* This function is called once, at assembler startup time.  It should
    set up all the tables, etc. that the MD part of the assembler will need.  */
 
@@ -1137,6 +1422,13 @@ md_begin (void)
   int i = 0;
   int broken = 0;
 
+  if (mips_pic != NO_PIC)
+    {
+      if (g_switch_seen && g_switch_value != 0)
+	as_bad (_("-G may not be used in position-independent code"));
+      g_switch_value = 0;
+    }
+
   if (! bfd_set_arch_mach (stdoutput, bfd_arch_mips, file_mips_arch))
     as_warn (_("Could not set architecture and machine"));
 
@@ -1160,6 +1452,11 @@ md_begin (void)
 	    {
 	      if (!validate_mips_insn (&mips_opcodes[i]))
 		broken = 1;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
