This commit was manufactured by cvs2svn to create tag 'csl-arm-2004-q1'.csl-arm-2004-q1

Sprout from binutils-2_15-branch 2004-03-22 04:06:07 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-'
Cherrypick from binutils-2_15-branch 2004-04-08 14:52:45 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    gas/testsuite/gas/dlx/lohi.d
    gas/testsuite/gas/dlx/lohi.s
    gas/testsuite/gas/sh/renesas-1.d
    gas/testsuite/gas/sh/renesas-1.s
    ld/emultempl/irix.em
Cherrypick from binutils-2_15-branch 2004-02-20 15:31:11 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    ld/testsuite/ld-scripts/align.s
    ld/testsuite/ld-scripts/align.t
Cherrypick from binutils-2_15-branch 2004-02-23 10:10:03 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    ld/testsuite/ld-scripts/provide-2.t
    ld/testsuite/ld-scripts/provide-3.t
Cherrypick from binutils-2_15-branch 2004-03-18 00:49:24 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    gas/testsuite/gas/cfi/cfi-sh-1.d
    gas/testsuite/gas/cfi/cfi-sh-1.s
Cherrypick from binutils-2_15-branch 2004-03-21 23:47:55 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    gas/testsuite/gas/cris/mulbug-err-1.s
    gas/testsuite/gas/cris/rd-mulbug-1.d
Cherrypick from binutils-2_15-branch 2004-02-19 14:08:32 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'binutils-':
    ld/testsuite/ld-scripts/data.exp
Cherrypick from master 2004-04-09 05:17:48 UTC Nathanael Nerode <neroden@gcc.gnu.org> '2004-04-09  Nathanael Nerode  <neroden@gcc.gnu.org>':
    ChangeLog
    MAINTAINERS
    Makefile.in
    Makefile.tpl
    bfd/ChangeLog
    bfd/Makefile.am
    bfd/Makefile.in
    bfd/aclocal.m4
    bfd/aix386-core.c
    bfd/archive.c
    bfd/archures.c
    bfd/bfd-in.h
    bfd/bfd-in2.h
    bfd/coff-tic54x.c
    bfd/config.bfd
    bfd/config.in
    bfd/configure
    bfd/configure.in
    bfd/cpu-cr16c.c
    bfd/cpu-frv.c
    bfd/cpu-sh.c
    bfd/doc/ChangeLog
    bfd/doc/Makefile.in
    bfd/doc/bfdint.texi
    bfd/dwarf2.c
    bfd/ecoffswap.h
    bfd/elf-bfd.h
    bfd/elf-eh-frame.c
    bfd/elf-hppa.h
    bfd/elf-m10200.c
    bfd/elf-m10300.c
    bfd/elf.c
    bfd/elf32-arm.h
    bfd/elf32-avr.c
    bfd/elf32-cr16c.c
    bfd/elf32-cris.c
    bfd/elf32-d10v.c
    bfd/elf32-dlx.c
    bfd/elf32-fr30.c
    bfd/elf32-frv.c
    bfd/elf32-gen.c
    bfd/elf32-h8300.c
    bfd/elf32-hppa.c
    bfd/elf32-i370.c
    bfd/elf32-i386.c
    bfd/elf32-i860.c
    bfd/elf32-ip2k.c
    bfd/elf32-iq2000.c
    bfd/elf32-m32r.c
    bfd/elf32-m68hc1x.c
    bfd/elf32-m68hc1x.h
    bfd/elf32-m68k.c
    bfd/elf32-mcore.c
    bfd/elf32-msp430.c
    bfd/elf32-openrisc.c
    bfd/elf32-ppc.c
    bfd/elf32-s390.c
    bfd/elf32-sh.c
    bfd/elf32-sh64.c
    bfd/elf32-sparc.c
    bfd/elf32-v850.c
    bfd/elf32-vax.c
    bfd/elf32-xstormy16.c
    bfd/elf32-xtensa.c
    bfd/elf64-alpha.c
    bfd/elf64-gen.c
    bfd/elf64-hppa.c
    bfd/elf64-mmix.c
    bfd/elf64-ppc.c
    bfd/elf64-s390.c
    bfd/elf64-sh64.c
    bfd/elf64-sparc.c
    bfd/elf64-x86-64.c
    bfd/elfarm-nabi.c
    bfd/elfcode.h
    bfd/elflink.c
    bfd/elfxx-ia64.c
    bfd/elfxx-mips.c
    bfd/elfxx-mips.h
    bfd/elfxx-target.h
    bfd/hppabsd-core.c
    bfd/hpux-core.c
    bfd/irix-core.c
    bfd/libaout.h
    bfd/libbfd.c
    bfd/libbfd.h
    bfd/linker.c
    bfd/mach-o.c
    bfd/netbsd-core.c
    bfd/osf-core.c
    bfd/pdp11.c
    bfd/peXXigen.c
    bfd/po/SRC-POTFILES.in
    bfd/po/bfd.pot
    bfd/ptrace-core.c
    bfd/reloc.c
    bfd/sco5-core.c
    bfd/stabs.c
    bfd/targets.c
    bfd/trad-core.c
    bfd/version.h
    binutils/ChangeLog
    binutils/MAINTAINERS
    binutils/Makefile.am
    binutils/Makefile.in
    binutils/aclocal.m4
    binutils/ar.c
    binutils/arsup.c
    binutils/config.in
    binutils/configure
    binutils/deflex.l
    binutils/defparse.y
    binutils/dlltool.c
    binutils/dlltool.h
    binutils/objcopy.c
    binutils/objdump.c
    binutils/po/binutils.pot
    binutils/readelf.c
    binutils/testsuite/ChangeLog
    binutils/testsuite/binutils-all/ar.exp
    binutils/testsuite/binutils-all/objcopy.exp
    config.guess
    config.sub
    config/ChangeLog
    config/accross.m4
    config/acx.m4
    configure
    configure.in
    cpu/ChangeLog
    cpu/frv.cpu
    cpu/frv.opc
    cpu/m32r.cpu
    cpu/m32r.opc
    cpu/sh.cpu
    cpu/sh.opc
    cpu/sh64-compact.cpu
    cpu/sh64-media.cpu
    gas/ChangeLog
    gas/Makefile.am
    gas/Makefile.in
    gas/aclocal.m4
    gas/config.in
    gas/config/obj-aout.c
    gas/config/obj-elf.c
    gas/config/tc-arc.c
    gas/config/tc-arm.c
    gas/config/tc-cris.c
    gas/config/tc-dlx.c
    gas/config/tc-frv.c
    gas/config/tc-hppa.c
    gas/config/tc-i386.c
    gas/config/tc-i386.h
    gas/config/tc-ia64.c
    gas/config/tc-ia64.h
    gas/config/tc-iq2000.c
    gas/config/tc-m32r.c
    gas/config/tc-mips.c
    gas/config/tc-mips.h
    gas/config/tc-ppc.c
    gas/config/tc-s390.c
    gas/config/tc-sh.c
    gas/config/tc-sh.h
    gas/config/tc-xtensa.c
    gas/configure
    gas/configure.in
    gas/doc/Makefile.in
    gas/doc/as.texinfo
    gas/doc/c-arm.texi
    gas/doc/c-cris.texi
    gas/doc/c-hppa.texi
    gas/doc/c-m32r.texi
    gas/doc/c-sh.texi
    gas/dw2gencfi.c
    gas/expr.c
    gas/po/gas.pot
    gas/read.c
    gas/stabs.c
    gas/testsuite/ChangeLog
    gas/testsuite/gas/alpha/elf-reloc-8.d
    gas/testsuite/gas/cfi/cfi-alpha-1.d
    gas/testsuite/gas/cfi/cfi-alpha-2.d
    gas/testsuite/gas/cfi/cfi-alpha-3.d
    gas/testsuite/gas/cfi/cfi-common-1.d
    gas/testsuite/gas/cfi/cfi-common-2.d
    gas/testsuite/gas/cfi/cfi-common-3.d
    gas/testsuite/gas/cfi/cfi-i386.d
    gas/testsuite/gas/cfi/cfi-m68k.d
    gas/testsuite/gas/cfi/cfi-s390x-1.d
    gas/testsuite/gas/cfi/cfi-x86_64.d
    gas/testsuite/gas/cfi/cfi.exp
    gas/testsuite/gas/cris/regreg.d
    gas/testsuite/gas/dlx/alltests.exp
    gas/testsuite/gas/dlx/itype.d
    gas/testsuite/gas/dlx/lhi.d
    gas/testsuite/gas/frv/allinsn.d
    gas/testsuite/gas/frv/allinsn.exp
    gas/testsuite/gas/frv/allinsn.s
    gas/testsuite/gas/frv/fr405-insn.d
    gas/testsuite/gas/frv/fr405-insn.l
    gas/testsuite/gas/frv/fr405-insn.s
    gas/testsuite/gas/frv/fr450-insn.d
    gas/testsuite/gas/frv/fr450-insn.l
    gas/testsuite/gas/frv/fr450-insn.s
    gas/testsuite/gas/frv/fr450-media-issue.l
    gas/testsuite/gas/frv/fr450-media-issue.s
    gas/testsuite/gas/frv/fr450-spr.d
    gas/testsuite/gas/frv/fr450-spr.s
    gas/testsuite/gas/i386/i386.exp
    gas/testsuite/gas/i386/katmai.d
    gas/testsuite/gas/i386/padlock.d
    gas/testsuite/gas/i386/padlock.s
    gas/testsuite/gas/i860/dir-intel03-err.l
    gas/testsuite/gas/m68hc11/m68hc11.exp
    gas/testsuite/gas/macros/macros.exp
    gas/testsuite/gas/ppc/altivec.d
    gas/testsuite/gas/ppc/altivec_xcoff.d
    gas/testsuite/gas/ppc/altivec_xcoff64.d
    gas/testsuite/gas/ppc/astest.d
    gas/testsuite/gas/ppc/astest2.d
    gas/testsuite/gas/ppc/astest2_64.d
    gas/testsuite/gas/ppc/astest64.d
    gas/testsuite/gas/ppc/booke.d
    gas/testsuite/gas/ppc/booke_xcoff.d
    gas/testsuite/gas/ppc/booke_xcoff64.d
    gas/testsuite/gas/ppc/e500.d
    gas/testsuite/gas/ppc/power4.d
    gas/testsuite/gas/ppc/test1elf32.d
    gas/testsuite/gas/ppc/test1elf64.d
    gas/testsuite/gas/ppc/test1xcoff32.d
    gas/testsuite/gas/sh/basic.exp
    gas/testsuite/gas/sh/sh64/err-dsp.s
    gprof/ChangeLog
    gprof/Makefile.am
    gprof/Makefile.in
    gprof/gconfig.in
    gprof/po/gprof.pot
    gprof/po/sv.po
    include/ChangeLog
    include/bfdlink.h
    include/dyn-string.h
    include/elf/ChangeLog
    include/elf/arm.h
    include/elf/common.h
    include/elf/cr16c.h
    include/elf/frv.h
    include/elf/sh.h
    include/hashtab.h
    include/opcode/ChangeLog
    include/opcode/i386.h
    include/opcode/ppc.h
    include/splay-tree.h
    install-sh
    ld/ChangeLog
    ld/Makefile.am
    ld/Makefile.in
    ld/NEWS
    ld/config.in
    ld/configure.tgt
    ld/emulparams/elf32bmipn32.sh
    ld/emulparams/elf32bsmip.sh
    ld/emulparams/elf32cr16c.sh
    ld/emulparams/elf32frvfd.sh
    ld/emulparams/elf64bmip.sh
    ld/emultempl/armelf.em
    ld/emultempl/armelf_oabi.em
    ld/emultempl/elf32.em
    ld/emultempl/hppaelf.em
    ld/emultempl/ppc64elf.em
    ld/emultempl/sh64elf.em
    ld/ld.texinfo
    ld/ldexp.c
    ld/ldfile.c
    ld/ldgram.y
    ld/ldlang.c
    ld/ldlang.h
    ld/ldlex.l
    ld/ldmain.c
    ld/ldmain.h
    ld/lexsup.c
    ld/pe-dll.c
    ld/po/ld.pot
    ld/po/sv.po
    ld/scripttempl/elf32cr16c.sc
    ld/testsuite/ChangeLog
    ld/testsuite/ld-cdtest/cdtest.exp
    ld/testsuite/ld-elfvers/vers.exp
    ld/testsuite/ld-frv/fdpic-pie-1.d
    ld/testsuite/ld-frv/fdpic-pie-2.d
    ld/testsuite/ld-frv/fdpic-pie-6.d
    ld/testsuite/ld-frv/fdpic-pie-7.d
    ld/testsuite/ld-frv/fdpic-pie-8.d
    ld/testsuite/ld-frv/fdpic-shared-1.d
    ld/testsuite/ld-frv/fdpic-shared-2.d
    ld/testsuite/ld-frv/fdpic-shared-3.d
    ld/testsuite/ld-frv/fdpic-shared-4.d
    ld/testsuite/ld-frv/fdpic-shared-5.d
    ld/testsuite/ld-frv/fdpic-shared-6.d
    ld/testsuite/ld-frv/fdpic-shared-7.d
    ld/testsuite/ld-frv/fdpic-shared-8.d
    ld/testsuite/ld-frv/fdpic-shared-local-2.d
    ld/testsuite/ld-frv/fdpic-shared-local-8.d
    ld/testsuite/ld-frv/fdpic-static-1.d
    ld/testsuite/ld-frv/fdpic-static-2.d
    ld/testsuite/ld-frv/fdpic-static-6.d
    ld/testsuite/ld-frv/fdpic-static-7.d
    ld/testsuite/ld-frv/fdpic-static-8.d
    ld/testsuite/ld-frv/fdpic.exp
    ld/testsuite/ld-frv/fr450-link.d
    ld/testsuite/ld-frv/fr450-linka.s
    ld/testsuite/ld-frv/fr450-linkb.s
    ld/testsuite/ld-frv/fr450-linkc.s
    ld/testsuite/ld-frv/frv-elf.exp
    ld/testsuite/ld-powerpc/tls.d
    ld/testsuite/ld-powerpc/tls32.d
    ld/testsuite/ld-powerpc/tlsexe.d
    ld/testsuite/ld-powerpc/tlsexe.r
    ld/testsuite/ld-powerpc/tlsexe32.d
    ld/testsuite/ld-powerpc/tlsexetoc.d
    ld/testsuite/ld-powerpc/tlsexetoc.r
    ld/testsuite/ld-powerpc/tlsso.d
    ld/testsuite/ld-powerpc/tlsso32.d
    ld/testsuite/ld-powerpc/tlstoc.d
    ld/testsuite/ld-powerpc/tlstocso.d
    ld/testsuite/ld-scripts/align.exp
    ld/testsuite/ld-scripts/assert.s
    ld/testsuite/ld-scripts/data.d
    ld/testsuite/ld-scripts/data.s
    ld/testsuite/ld-scripts/data.t
    ld/testsuite/ld-scripts/defined2.d
    ld/testsuite/ld-scripts/defined3.d
    ld/testsuite/ld-scripts/provide-1.d
    ld/testsuite/ld-scripts/provide-1.s
    ld/testsuite/ld-scripts/provide-1.t
    ld/testsuite/ld-scripts/provide-2.d
    ld/testsuite/ld-scripts/provide-2.s
    ld/testsuite/ld-scripts/provide-3.d
    ld/testsuite/ld-scripts/provide-3.s
    ld/testsuite/ld-scripts/provide.exp
    ld/testsuite/ld-scripts/size-1.d
    ld/testsuite/ld-scripts/size-1.s
    ld/testsuite/ld-scripts/size-1.t
    ld/testsuite/ld-scripts/size-2.d
    ld/testsuite/ld-scripts/size-2.s
    ld/testsuite/ld-scripts/size-2.t
    ld/testsuite/ld-scripts/size.exp
    libiberty/ChangeLog
    libiberty/Makefile.in
    libiberty/config.in
    libiberty/configure
    libiberty/configure.ac
    libiberty/cp-demangle.c
    libiberty/cp-demangle.h
    libiberty/dyn-string.c
    libiberty/hashtab.c
    libiberty/pex-common.h
    libiberty/pex-unix.c
    libiberty/testsuite/demangle-expected
    libiberty/testsuite/test-demangle.c
    mkinstalldirs
    opcodes/ChangeLog
    opcodes/aclocal.m4
    opcodes/config.in
    opcodes/configure
    opcodes/frv-asm.c
    opcodes/frv-desc.c
    opcodes/frv-desc.h
    opcodes/frv-dis.c
    opcodes/frv-ibld.c
    opcodes/frv-opc.c
    opcodes/frv-opc.h
    opcodes/i386-dis.c
    opcodes/m32r-asm.c
    opcodes/po/POTFILES.in
    opcodes/po/de.po
    opcodes/po/opcodes.pot
    opcodes/ppc-dis.c
    opcodes/ppc-opc.c
    opcodes/sh-dis.c
    opcodes/sh-opc.h
    opcodes/sparc-dis.c
    src-release
    texinfo/texinfo.tex
Delete:
    bfd/elflink.h
    bfd/mpw-config.in
    bfd/mpw-make.sed
    binutils/mac-binutils.r
    binutils/mpw-config.in
    binutils/mpw-make.sed
    gas/mac-as.r
    gas/mpw-config.in
    gas/mpw-make.sed
    include/mpw/ChangeLog
    include/mpw/README
    include/mpw/dir.h
    include/mpw/dirent.h
    include/mpw/fcntl.h
    include/mpw/grp.h
    include/mpw/mpw.h
    include/mpw/pwd.h
    include/mpw/spin.h
    include/mpw/stat.h
    include/mpw/sys/file.h
    include/mpw/sys/param.h
    include/mpw/sys/resource.h
    include/mpw/sys/stat.h
    include/mpw/sys/time.h
    include/mpw/sys/types.h
    include/mpw/utime.h
    include/mpw/varargs.h
    ld/mac-ld.r
    ld/mpw-config.in
    ld/mpw-make.sed
    ld/testsuite/ld-frv/fdpic-pie-8-fail.d
    libiberty/acconfig.h
    mpw-README
    mpw-build.in
    mpw-config.in
    mpw-configure
    mpw-install
    opcodes/mpw-config.in
    opcodes/mpw-make.sed

1 files changed, 58 insertions, 6 deletions

diff --git a/config.guess b/config.guess
index fa58459..00ccf89 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-06-12'
+timestamp='2004-02-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -197,12 +197,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -221,6 +227,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -236,6 +245,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -307,6 +325,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -399,6 +420,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -734,7 +758,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -742,6 +766,11 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -751,7 +780,7 @@ EOF
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+    *:FreeBSD:*:*)
 	# Determine whether the default compiler uses glibc.
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -763,7 +792,10 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -796,8 +828,13 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
@@ -885,6 +922,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -942,6 +982,9 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
@@ -972,6 +1015,9 @@ EOF
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1043,7 +1089,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1158,7 +1204,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1199,6 +1245,12 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2