bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Emacs LynxOS update


From: Olli Savia
Subject: [PATCH] Emacs LynxOS update
Date: Thu, 25 Aug 2005 11:13:09 +0300

Hi

This is a patch against current (2005-08-24) CVS version of Emacs.
It fixes a few compile errors on LynxOS and adds support for
LynxOS 4.0.0. The patch includes latest versions of config.guess and
config.sub which can properly detect different LynxOS versions.
Could you consider adding it to the future releases of Emacs?

Regards,
Olli



Index: emacs/config.guess
===================================================================
RCS file: /cvsroot/emacs/emacs/config.guess,v
retrieving revision 1.129
diff -c -r1.129 config.guess
*** emacs/config.guess  4 Jul 2005 14:04:09 -0000       1.129
--- emacs/config.guess  24 Aug 2005 20:46:15 -0000
***************
*** 1,9 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002 Free Software Foundation, Inc.
  
! timestamp='2002-11-13'
  
  # 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
--- 1,9 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
! timestamp='2005-08-03'
  
  # 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
***************
*** 17,29 ****
  #
  # 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., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that
program.
  
  # Originally written by Per Bothner <address@hidden>.
  # Please send patches to <address@hidden>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
--- 17,31 ----
  #
  # 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., 51 Franklin Street - Fifth Floor, Boston, MA
! # 02110-1301, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that
program.
  
+ 
  # Originally written by Per Bothner <address@hidden>.
  # Please send patches to <address@hidden>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
***************
*** 53,59 ****
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There
is NO
--- 55,61 ----
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There
is NO
***************
*** 66,76 ****
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
!        echo "$timestamp" ; exit 0 ;;
      --version | -v )
!        echo "$version" ; exit 0 ;;
      --help | --h* | -h )
!        echo "$usage"; exit 0 ;;
      -- )     # Stop option processing
         shift; break ;;
      - )       # Use stdin as input.
--- 68,78 ----
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
!        echo "$timestamp" ; exit ;;
      --version | -v )
!        echo "$version" ; exit ;;
      --help | --h* | -h )
!        echo "$usage"; exit ;;
      -- )     # Stop option processing
         shift; break ;;
      - )       # Use stdin as input.
***************
*** 98,111 ****
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
! # This shell variable is my proudest work .. or something. --bje
  
! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
!    || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
! dummy=$tmpdir/dummy ;
! files="$dummy.c $dummy.o $dummy.rel $dummy" ;
! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
  case $CC_FOR_BUILD,$HOST_CC,$CC in
   ,,)    echo "int x;" > $dummy.c ;
        for c in cc gcc c89 c99 ; do
--- 100,117 ----
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
! # Portable tmp directory creation inspired by the Autoconf team.
  
! set_cc_for_build='
! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp
2>/dev/null) && exit \$exitcode" 0 ;
! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1
2 13 15 ;
! : ${TMPDIR=/tmp} ;
!  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp" ; } ||
!  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 &&
mkdir $tmp) ; } ||
!  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning:
creating insecure temp directory" >&2 ; } ||
!  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ;
exit 1 ; } ;
! dummy=$tmp/dummy ;
! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
  case $CC_FOR_BUILD,$HOST_CC,$CC in
   ,,)    echo "int x;" > $dummy.c ;
        for c in cc gcc c89 c99 ; do
***************
*** 113,127 ****
             CC_FOR_BUILD="$c"; break ;
          fi ;
        done ;
-       rm -f $files ;
        if test x"$CC_FOR_BUILD" = x ; then
          CC_FOR_BUILD=no_compiler_found ;
        fi
        ;;
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
! esac ;
! unset files'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD
universe.
  # (address@hidden 1994-08-24)
--- 119,131 ----
             CC_FOR_BUILD="$c"; break ;
          fi ;
        done ;
        if test x"$CC_FOR_BUILD" = x ; then
          CC_FOR_BUILD=no_compiler_found ;
        fi
        ;;
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
! esac ; set_cc_for_build= ;'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD
universe.
  # (address@hidden 1994-08-24)
***************
*** 178,321 ****
                ;;
        esac
        # The OS release
!       release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
!       exit 0 ;;
!     amiga:OpenBSD:*:*)
!       echo m68k-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     arc:OpenBSD:*:*)
!       echo mipsel-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     hp300:OpenBSD:*:*)
!       echo m68k-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     mac68k:OpenBSD:*:*)
!       echo m68k-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     macppc:OpenBSD:*:*)
!       echo powerpc-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     mvme68k:OpenBSD:*:*)
!       echo m68k-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     mvme88k:OpenBSD:*:*)
!       echo m88k-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     mvmeppc:OpenBSD:*:*)
!       echo powerpc-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     pmax:OpenBSD:*:*)
!       echo mipsel-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     sgi:OpenBSD:*:*)
!       echo mipseb-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     sun3:OpenBSD:*:*)
!       echo m68k-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     wgrisc:OpenBSD:*:*)
!       echo mipsel-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
      *:OpenBSD:*:*)
!       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
      alpha:OSF1:*:*)
!       if test $UNAME_RELEASE = "V4.0"; then
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
!       fi
        # A Vn.n version is a released version.
        # A Tn.n version is a released field test version.
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
!       eval $set_cc_for_build
!       cat <<EOF >$dummy.s
!       .data
! \$Lformat:
!       .byte 37,100,45,37,120,10,0     # "%d-%x\n"
! 
!       .text
!       .globl main
!       .align 4
!       .ent main
! main:
!       .frame \$30,16,\$26,0
!       ldgp \$29,0(\$27)
!       .prologue 1
!       .long 0x47e03d80 # implver \$0
!       lda \$2,-1
!       .long 0x47e20c21 # amask \$2,\$1
!       lda \$16,\$Lformat
!       mov \$0,\$17
!       not \$1,\$18
!       jsr \$26,printf
!       ldgp \$29,0(\$26)
!       mov 0,\$16
!       jsr \$26,exit
!       .end main
! EOF
!       $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
!       if test "$?" = 0 ; then
!               case `$dummy` in
!                       0-0)
!                               UNAME_MACHINE="alpha"
!                               ;;
!                       1-0)
!                               UNAME_MACHINE="alphaev5"
!                               ;;
!                       1-1)
!                               UNAME_MACHINE="alphaev56"
!                               ;;
!                       1-101)
!                               UNAME_MACHINE="alphapca56"
!                               ;;
!                       2-303)
!                               UNAME_MACHINE="alphaev6"
!                               ;;
!                       2-307)
!                               UNAME_MACHINE="alphaev67"
!                               ;;
!                       2-1307)
!                               UNAME_MACHINE="alphaev68"
!                               ;;
!                       3-1307)
!                               UNAME_MACHINE="alphaev7"
!                               ;;
!               esac
!       fi
!       rm -f $dummy.s $dummy && rmdir $tmpdir
!       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
!       exit 0 ;;
      Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX
subsystem?
        # Should we change UNAME_MACHINE based on the output of uname instead
        # of the specific Alpha model?
        echo alpha-pc-interix
!       exit 0 ;;
      21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
!       exit 0 ;;
      Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
!       exit 0;;
      *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
!       exit 0 ;;
      *:[Mm]orph[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-morphos
!       exit 0 ;;
      *:OS/390:*:*)
        echo i370-ibm-openedition
!       exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
!       exit 0;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
!       exit 0;;
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
        # address@hidden (Earle F. Ake) contributed MIS and NILE.
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
--- 182,306 ----
                ;;
        esac
        # The OS release
!       # Debian GNU/NetBSD machines have a different userland, and
!       # thus, need a distinct triplet. However, they do not need
!       # kernel version information, so it can be replaced with a
!       # suitable tag, in the style of linux-gnu.
!       case "${UNAME_VERSION}" in
!           Debian*)
!               release='-gnu'
!               ;;
!           *)
!               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
!               ;;
!       esac
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
!       exit ;;
      *:OpenBSD:*:*)
!       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
!       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
!       exit ;;
!     *:ekkoBSD:*:*)
!       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
!       exit ;;
!     macppc:MirBSD:*:*)
!       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
!       exit ;;
!     *:MirBSD:*:*)
!       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
!       exit ;;
      alpha:OSF1:*:*)
!       case $UNAME_RELEASE in
!       *4.0)
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
!               ;;
!       *5.*)
!               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
!               ;;
!       esac
!       # According to Compaq, /usr/sbin/psrinfo has been available on
!       # OSF/1 and Tru64 systems produced since 1995.  I hope that
!       # covers most systems running today.  This code pipes the CPU
!       # types through head -n 1, so we only detect the type of CPU 0.
!       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*
\) processor.*$/\1/p' | head -n 1`
!       case "$ALPHA_CPU_TYPE" in
!           "EV4 (21064)")
!               UNAME_MACHINE="alpha" ;;
!           "EV4.5 (21064)")
!               UNAME_MACHINE="alpha" ;;
!           "LCA4 (21066/21068)")
!               UNAME_MACHINE="alpha" ;;
!           "EV5 (21164)")
!               UNAME_MACHINE="alphaev5" ;;
!           "EV5.6 (21164A)")
!               UNAME_MACHINE="alphaev56" ;;
!           "EV5.6 (21164PC)")
!               UNAME_MACHINE="alphapca56" ;;
!           "EV5.7 (21164PC)")
!               UNAME_MACHINE="alphapca57" ;;
!           "EV6 (21264)")
!               UNAME_MACHINE="alphaev6" ;;
!           "EV6.7 (21264A)")
!               UNAME_MACHINE="alphaev67" ;;
!           "EV6.8CB (21264C)")
!               UNAME_MACHINE="alphaev68" ;;
!           "EV6.8AL (21264B)")
!               UNAME_MACHINE="alphaev68" ;;
!           "EV6.8CX (21264D)")
!               UNAME_MACHINE="alphaev68" ;;
!           "EV6.9A (21264/EV69A)")
!               UNAME_MACHINE="alphaev69" ;;
!           "EV7 (21364)")
!               UNAME_MACHINE="alphaev7" ;;
!           "EV7.9 (21364A)")
!               UNAME_MACHINE="alphaev79" ;;
!       esac
!       # A Pn.n version is a patched version.
        # A Vn.n version is a released version.
        # A Tn.n version is a released field test version.
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
!       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
!       exit ;;
      Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX
subsystem?
        # Should we change UNAME_MACHINE based on the output of uname instead
        # of the specific Alpha model?
        echo alpha-pc-interix
!       exit ;;
      21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
!       exit ;;
      Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
!       exit ;;
      *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
!       exit ;;
      *:[Mm]orph[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-morphos
!       exit ;;
      *:OS/390:*:*)
        echo i370-ibm-openedition
!       exit ;;
!     *:z/VM:*:*)
!       echo s390-ibm-zvmoe
!       exit ;;
!     *:OS400:*:*)
!         echo powerpc-ibm-os400
!       exit ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
!       exit ;;
!     arm:riscos:*:*|arm:RISCOS:*:*)
!       echo arm-unknown-riscos
!       exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
!       exit ;;
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
        # address@hidden (Earle F. Ake) contributed MIS and NILE.
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
***************
*** 323,351 ****
        else
                echo pyramid-pyramid-bsd
        fi
!       exit 0 ;;
      NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
!       exit 0 ;;
!     DRS?6000:UNIX_SV:4.2*:7*)
        case `/usr/bin/uname -p` in
!           sparc) echo sparc-icl-nx7 && exit 0 ;;
        esac ;;
      sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit 0 ;;
      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit 0 ;;
      i86pc:SunOS:5.*:*)
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit 0 ;;
      sun4*:SunOS:6*:*)
        # According to config.sub, this is the proper way to canonicalize
        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
        # it's likely to be more like Solaris than SunOS4.
        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit 0 ;;
      sun4*:SunOS:*:*)
        case "`/usr/bin/arch -k`" in
            Series*|S4*)
--- 308,339 ----
        else
                echo pyramid-pyramid-bsd
        fi
!       exit ;;
      NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
!       exit ;;
!     DRS?6000:unix:4.0:6*)
!       echo sparc-icl-nx6
!       exit ;;
!     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
        case `/usr/bin/uname -p` in
!           sparc) echo sparc-icl-nx7; exit ;;
        esac ;;
      sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit ;;
      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit ;;
      i86pc:SunOS:5.*:*)
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit ;;
      sun4*:SunOS:6*:*)
        # According to config.sub, this is the proper way to canonicalize
        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
        # it's likely to be more like Solaris than SunOS4.
        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
!       exit ;;
      sun4*:SunOS:*:*)
        case "`/usr/bin/arch -k`" in
            Series*|S4*)
***************
*** 354,363 ****
        esac
        # Japanese Language versions have a version number like `4.1.3-JL'.
        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
!       exit 0 ;;
      sun3*:SunOS:*:*)
        echo m68k-sun-sunos${UNAME_RELEASE}
!       exit 0 ;;
      sun*:*:4.2BSD:*)
        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}')
2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
--- 342,351 ----
        esac
        # Japanese Language versions have a version number like `4.1.3-JL'.
        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
!       exit ;;
      sun3*:SunOS:*:*)
        echo m68k-sun-sunos${UNAME_RELEASE}
!       exit ;;
      sun*:*:4.2BSD:*)
        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}')
2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
***************
*** 369,378 ****
                echo sparc-sun-sunos${UNAME_RELEASE}
                ;;
        esac
!       exit 0 ;;
      aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
!       exit 0 ;;
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
--- 357,366 ----
                echo sparc-sun-sunos${UNAME_RELEASE}
                ;;
        esac
!       exit ;;
      aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
!       exit ;;
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
***************
*** 383,419 ****
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
!       exit 0 ;;
      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
!         exit 0 ;;
      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
!       exit 0 ;;
      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
          echo m68k-milan-mint${UNAME_RELEASE}
!         exit 0 ;;
      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
          echo m68k-hades-mint${UNAME_RELEASE}
!         exit 0 ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
          echo m68k-unknown-mint${UNAME_RELEASE}
!         exit 0 ;;
      powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
!       exit 0 ;;
      RISC*:Mach:*:*)
        echo mips-dec-mach_bsd4.3
!       exit 0 ;;
      RISC*:ULTRIX:*:*)
        echo mips-dec-ultrix${UNAME_RELEASE}
!       exit 0 ;;
      VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
!       exit 0 ;;
      2020:CLIX:*:* | 2430:CLIX:*:*)
        echo clipper-intergraph-clix${UNAME_RELEASE}
!       exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
--- 371,410 ----
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
!       exit ;;
      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
!         exit ;;
      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
!       exit ;;
      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
          echo m68k-milan-mint${UNAME_RELEASE}
!         exit ;;
      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
          echo m68k-hades-mint${UNAME_RELEASE}
!         exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
          echo m68k-unknown-mint${UNAME_RELEASE}
!         exit ;;
!     m68k:machten:*:*)
!       echo m68k-apple-machten${UNAME_RELEASE}
!       exit ;;
      powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
!       exit ;;
      RISC*:Mach:*:*)
        echo mips-dec-mach_bsd4.3
!       exit ;;
      RISC*:ULTRIX:*:*)
        echo mips-dec-ultrix${UNAME_RELEASE}
!       exit ;;
      VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
!       exit ;;
      2020:CLIX:*:* | 2430:CLIX:*:*)
        echo clipper-intergraph-clix${UNAME_RELEASE}
!       exit ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
***************
*** 437,469 ****
          exit (-1);
        }
  EOF
!       $CC_FOR_BUILD -o $dummy $dummy.c \
!         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'`
\
!         && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
!       rm -f $dummy.c $dummy && rmdir $tmpdir
        echo mips-mips-riscos${UNAME_RELEASE}
!       exit 0 ;;
      Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
!       exit 0 ;;
      Motorola:*:4.3:PL8-*)
        echo powerpc-harris-powermax
!       exit 0 ;;
      Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
        echo powerpc-harris-powermax
!       exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
!       exit 0 ;;
      m88k:CX/UX:7*:*)
        echo m88k-harris-cxux7
!       exit 0 ;;
      m88k:*:4*:R4*)
        echo m88k-motorola-sysv4
!       exit 0 ;;
      m88k:*:3*:R3*)
        echo m88k-motorola-sysv3
!       exit 0 ;;
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
--- 428,460 ----
          exit (-1);
        }
  EOF
!       $CC_FOR_BUILD -o $dummy $dummy.c &&
!         dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'`
&&
!         SYSTEM_NAME=`$dummy $dummyarg` &&
!           { echo "$SYSTEM_NAME"; exit; }
        echo mips-mips-riscos${UNAME_RELEASE}
!       exit ;;
      Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
!       exit ;;
      Motorola:*:4.3:PL8-*)
        echo powerpc-harris-powermax
!       exit ;;
      Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
        echo powerpc-harris-powermax
!       exit ;;
      Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
!       exit ;;
      m88k:CX/UX:7*:*)
        echo m88k-harris-cxux7
!       exit ;;
      m88k:*:4*:R4*)
        echo m88k-motorola-sysv4
!       exit ;;
      m88k:*:3*:R3*)
        echo m88k-motorola-sysv3
!       exit ;;
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
***************
*** 479,507 ****
        else
            echo i586-dg-dgux${UNAME_RELEASE}
        fi
!       exit 0 ;;
      M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3
!       exit 0 ;;
      M88*:*:R3*:*)
        # Delta 88k system running SVR3
        echo m88k-motorola-sysv3
!       exit 0 ;;
      XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
        echo m88k-tektronix-sysv3
!       exit 0 ;;
      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek
(BSD)
        echo m68k-tektronix-bsd
!       exit 0 ;;
      *:IRIX*:*:*)
        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
!       exit 0 ;;
      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
!       echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
!       exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
      i*86:AIX:*:*)
        echo i386-ibm-aix
!       exit 0 ;;
      ia64:AIX:*:*)
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
--- 470,498 ----
        else
            echo i586-dg-dgux${UNAME_RELEASE}
        fi
!       exit ;;
      M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3
!       exit ;;
      M88*:*:R3*:*)
        # Delta 88k system running SVR3
        echo m88k-motorola-sysv3
!       exit ;;
      XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
        echo m88k-tektronix-sysv3
!       exit ;;
      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek
(BSD)
        echo m68k-tektronix-bsd
!       exit ;;
      *:IRIX*:*:*)
        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
!       exit ;;
      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
!       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
!       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
      i*86:AIX:*:*)
        echo i386-ibm-aix
!       exit ;;
      ia64:AIX:*:*)
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
***************
*** 509,515 ****
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
!       exit 0 ;;
      *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
                eval $set_cc_for_build
--- 500,506 ----
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
!       exit ;;
      *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
                eval $set_cc_for_build
***************
*** 524,538 ****
                        exit(0);
                        }
  EOF
!               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c 
$dummy
&& rmdir $tmpdir && exit 0
!               rm -f $dummy.c $dummy && rmdir $tmpdir
!               echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
        else
                echo rs6000-ibm-aix3.2
        fi
!       exit 0 ;;
      *:AIX:*:[45])
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q |
awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null
2>&1; then
--- 515,532 ----
                        exit(0);
                        }
  EOF
!               if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
!               then
!                       echo "$SYSTEM_NAME"
!               else
!                       echo rs6000-ibm-aix3.2.5
!               fi
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
        else
                echo rs6000-ibm-aix3.2
        fi
!       exit ;;
      *:AIX:*:[45])
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q |
awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null
2>&1; then
***************
*** 546,573 ****
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
!       exit 0 ;;
      *:AIX:*:*)
        echo rs6000-ibm-aix
!       exit 0 ;;
      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
        echo romp-ibm-bsd4.4
!       exit 0 ;;
      ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
!       exit 0 ;;                           # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
        echo rs6000-bull-bosx
!       exit 0 ;;
      DPX/2?00:B.O.S.:*:*)
        echo m68k-bull-sysv3
!       exit 0 ;;
      9000/[34]??:4.3bsd:1.*:*)
        echo m68k-hp-bsd
!       exit 0 ;;
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
!       exit 0 ;;
      9000/[34678]??:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "${UNAME_MACHINE}" in
--- 540,567 ----
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
!       exit ;;
      *:AIX:*:*)
        echo rs6000-ibm-aix
!       exit ;;
      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
        echo romp-ibm-bsd4.4
!       exit ;;
      ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
!       exit ;;                             # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
        echo rs6000-bull-bosx
!       exit ;;
      DPX/2?00:B.O.S.:*:*)
        echo m68k-bull-sysv3
!       exit ;;
      9000/[34]??:4.3bsd:1.*:*)
        echo m68k-hp-bsd
!       exit ;;
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
!       exit ;;
      9000/[34678]??:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "${UNAME_MACHINE}" in
***************
*** 624,639 ****
                }
  EOF
                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) &&
HP_ARCH=`$dummy`
!                   if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
!                   rm -f $dummy.c $dummy && rmdir $tmpdir
                fi ;;
        esac
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
!       exit 0 ;;
      ia64:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        echo ia64-hp-hpux${HPUX_REV}
!       exit 0 ;;
      3050*:HI-UX:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
--- 618,653 ----
                }
  EOF
                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) &&
HP_ARCH=`$dummy`
!                   test -z "$HP_ARCH" && HP_ARCH=hppa
                fi ;;
        esac
+       if [ ${HP_ARCH} = "hppa2.0w" ]
+       then
+           eval $set_cc_for_build
+ 
+           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a
compiler
+           # generating 64-bit code.  GNU and HP use different nomenclature:
+           #
+           # $ CC_FOR_BUILD=cc ./config.guess
+           # => hppa2.0w-hp-hpux11.23
+           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+           # => hppa64-hp-hpux11.23
+ 
+           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+               grep __LP64__ >/dev/null
+           then
+               HP_ARCH="hppa2.0w"
+           else
+               HP_ARCH="hppa64"
+           fi
+       fi
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
!       exit ;;
      ia64:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        echo ia64-hp-hpux${HPUX_REV}
!       exit ;;
      3050*:HI-UX:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
***************
*** 661,809 ****
          exit (0);
        }
  EOF
!       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy
&& rmdir $tmpdir && exit 0
!       rm -f $dummy.c $dummy && rmdir $tmpdir
        echo unknown-hitachi-hiuxwe2
!       exit 0 ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo hppa1.1-hp-bsd
!       exit 0 ;;
      9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
!       exit 0 ;;
      *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
        echo hppa1.0-hp-mpeix
!       exit 0 ;;
      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
!       exit 0 ;;
      hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
!       exit 0 ;;
      i*86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
            echo ${UNAME_MACHINE}-unknown-osf1
        fi
!       exit 0 ;;
      parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
!       exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
!         exit 0 ;;
      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
!         exit 0 ;;
      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
        echo c34-convex-bsd
!         exit 0 ;;
      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
        echo c38-convex-bsd
!         exit 0 ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
!         exit 0 ;;
      CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit 0 ;;
      CRAY*[A-Z]90:*:*:*)
        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
              -e 's/\.[^.]*$/.X/'
!       exit 0 ;;
      CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit 0 ;;
!     CRAY*T3D:*:*:*)
!       echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit 0 ;;
      CRAY*T3E:*:*:*)
        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit 0 ;;
      CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit 0 ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          echo "${FUJITSU_PROC}-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 ;;
      sparc*:BSD/OS:*:*)
        echo sparc-unknown-bsdi${UNAME_RELEASE}
!       exit 0 ;;
      *:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
!       exit 0 ;;
      *:FreeBSD:*:*)
!       # Determine whether the default compiler uses glibc.
!       eval $set_cc_for_build
!       sed 's/^        //' << EOF >$dummy.c
!       #include <features.h>
!       #if __GLIBC__ >= 2
!       LIBC=gnu
!       #else
!       LIBC=
!       #endif
! EOF
!       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
!       rm -f $dummy.c && rmdir $tmpdir
!       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`${LIBC:+-$LIBC}
!       exit 0 ;;
      i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
!       exit 0 ;;
      i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
!       exit 0 ;;
      i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
!       exit 0 ;;
!     x86:Interix*:3*)
!       echo i386-pc-interix3
!       exit 0 ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* |
[345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
!       exit 0 ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX
subsystem?
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
        # UNAME_MACHINE based on the output of uname instead of i386?
!       echo i386-pc-interix
!       exit 0 ;;
      i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
!       exit 0 ;;
      p*:CYGWIN*:*)
        echo powerpcle-unknown-cygwin
!       exit 0 ;;
      prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
!       exit 0 ;;
      *:GNU:*:*)
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
!       exit 0 ;;
      i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
!       exit 0 ;;
      arm*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit 0 ;;
      ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit 0 ;;
      m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit 0 ;;
      mips:Linux:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
--- 675,840 ----
          exit (0);
        }
  EOF
!       $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
!               { echo "$SYSTEM_NAME"; exit; }
        echo unknown-hitachi-hiuxwe2
!       exit ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo hppa1.1-hp-bsd
!       exit ;;
      9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
!       exit ;;
      *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
        echo hppa1.0-hp-mpeix
!       exit ;;
      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
!       exit ;;
      hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
!       exit ;;
      i*86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
            echo ${UNAME_MACHINE}-unknown-osf1
        fi
!       exit ;;
      parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
!       exit ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
!         exit ;;
      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
!         exit ;;
      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
        echo c34-convex-bsd
!         exit ;;
      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
        echo c38-convex-bsd
!         exit ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
!         exit ;;
      CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit ;;
      CRAY*[A-Z]90:*:*:*)
        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
              -e 's/\.[^.]*$/.X/'
!       exit ;;
      CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit ;;
      CRAY*T3E:*:*:*)
        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit ;;
      CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit ;;
!     *:UNICOS/mp:*:*)
!       echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
!       exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
!         exit ;;
!     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 ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
!       exit ;;
      sparc*:BSD/OS:*:*)
        echo sparc-unknown-bsdi${UNAME_RELEASE}
!       exit ;;
      *:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
!       exit ;;
      *:FreeBSD:*:*)
!       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
!       exit ;;
      i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
!       exit ;;
      i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
!       exit ;;
!     i*:windows32*:*)
!       # uname -m includes "-pc" on this system.
!       echo ${UNAME_MACHINE}-mingw32
!       exit ;;
      i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
!       exit ;;
!     x86:Interix*:[34]*)
!       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
!       exit ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* |
[345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
!       exit ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX
subsystem?
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
        # UNAME_MACHINE based on the output of uname instead of i386?
!       echo i586-pc-interix
!       exit ;;
      i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
!       exit ;;
!     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
!       echo x86_64-unknown-cygwin
!       exit ;;
      p*:CYGWIN*:*)
        echo powerpcle-unknown-cygwin
!       exit ;;
      prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
!       exit ;;
      *:GNU:*:*)
+       # the GNU system
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
!       exit ;;
!     *: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 ;;
      i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
!       exit ;;
      arm*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
!     cris:Linux:*:*)
!       echo cris-axis-linux-gnu
!       exit ;;
!     crisv32:Linux:*:*)
!       echo crisv32-axis-linux-gnu
!       exit ;;
!     frv:Linux:*:*)
!       echo frv-unknown-linux-gnu
!       exit ;;
      ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
!     m32r*:Linux:*:*)
!       echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
      m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
      mips:Linux:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
***************
*** 821,835 ****
        #endif
  EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
!       rm -f $dummy.c && rmdir $tmpdir
!       test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
        ;;
      ppc:Linux:*:*)
        echo powerpc-unknown-linux-gnu
!       exit 0 ;;
      ppc64:Linux:*:*)
        echo powerpc64-unknown-linux-gnu
!       exit 0 ;;
      alpha:Linux:*:*)
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
          EV5)   UNAME_MACHINE=alphaev5 ;;
--- 852,887 ----
        #endif
  EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
!       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
!       ;;
!     mips64:Linux:*:*)
!       eval $set_cc_for_build
!       sed 's/^        //' << EOF >$dummy.c
!       #undef CPU
!       #undef mips64
!       #undef mips64el
!       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) ||
defined(MIPSEL)
!       CPU=mips64el
!       #else
!       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) ||
defined(MIPSEB)
!       CPU=mips64
!       #else
!       CPU=
!       #endif
!       #endif
! EOF
!       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
!       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
+     or32:Linux:*:*)
+       echo or32-unknown-linux-gnu
+       exit ;;
      ppc:Linux:*:*)
        echo powerpc-unknown-linux-gnu
!       exit ;;
      ppc64:Linux:*:*)
        echo powerpc64-unknown-linux-gnu
!       exit ;;
      alpha:Linux:*:*)
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
          EV5)   UNAME_MACHINE=alphaev5 ;;
***************
*** 843,849 ****
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
!       exit 0 ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2`
in
--- 895,901 ----
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
!       exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2`
in
***************
*** 851,872 ****
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
          *)    echo hppa-unknown-linux-gnu ;;
        esac
!       exit 0 ;;
      parisc64:Linux:*:* | hppa64:Linux:*:*)
        echo hppa64-unknown-linux-gnu
!       exit 0 ;;
      s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
!       exit 0 ;;
      sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit 0 ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit 0 ;;
      x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
!       exit 0 ;;
      i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
--- 903,927 ----
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
          *)    echo hppa-unknown-linux-gnu ;;
        esac
!       exit ;;
      parisc64:Linux:*:* | hppa64:Linux:*:*)
        echo hppa64-unknown-linux-gnu
!       exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
!       exit ;;
!     sh64*:Linux:*:*)
!       echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
      sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
!       exit ;;
      x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
!       exit ;;
      i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
***************
*** 884,898 ****
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
!               exit 0 ;;
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
!               exit 0 ;;
          "")
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
                # one that does not give us useful --help.
                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
!               exit 0 ;;
        esac
        # Determine whether the default compiler is a.out or elf
        eval $set_cc_for_build
--- 939,953 ----
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
!               exit ;;
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
!               exit ;;
          "")
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
                # one that does not give us useful --help.
                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
!               exit ;;
        esac
        # Determine whether the default compiler is a.out or elf
        eval $set_cc_for_build
***************
*** 915,932 ****
        LIBC=gnuaout
        #endif
        #endif
  EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
!       rm -f $dummy.c && rmdir $tmpdir
!       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" &&
exit 0
!       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
        ;;
      i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
        # sysname and nodename.
        echo i386-sequent-sysv4
!       exit 0 ;;
      i*86:UNIX_SV:4.2MP:2.*)
          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
--- 970,992 ----
        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
!       }
!       test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
        ;;
      i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
        # sysname and nodename.
        echo i386-sequent-sysv4
!       exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
***************
*** 934,940 ****
        # I just have to hope.  -- rms.
          # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
!       exit 0 ;;
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
--- 994,1020 ----
        # I just have to hope.  -- rms.
          # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
!       exit ;;
!     i*86:OS/2:*:*)
!       # If we were able to find `uname', then EMX Unix compatibility
!       # is probably installed.
!       echo ${UNAME_MACHINE}-pc-os2-emx
!       exit ;;
!     i*86:XTS-300:*:STOP)
!       echo ${UNAME_MACHINE}-unknown-stop
!       exit ;;
!     i*86:atheos:*:*)
!       echo ${UNAME_MACHINE}-unknown-atheos
!       exit ;;
!     i*86:syllable:*:*)
!       echo ${UNAME_MACHINE}-pc-syllable
!       exit ;;
!     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
!       echo i386-unknown-lynxos${UNAME_RELEASE}
!       exit ;;
!     i*86:*DOS:*:*)
!       echo ${UNAME_MACHINE}-pc-msdosdjgpp
!       exit ;;
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
***************
*** 942,956 ****
        else
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
        fi
!       exit 0 ;;
!     i*86:*:5:[78]*)
        case `/bin/uname -X | grep "^Machine"` in
            *486*)           UNAME_MACHINE=i486 ;;
            *Pentium)        UNAME_MACHINE=i586 ;;
            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
        esac
        echo ${UNAME_MACHINE}-unknown-sysv
${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
!       exit 0 ;;
      i*86:*:3.2:*)
        if test -f /usr/options/cb.name; then
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
--- 1022,1037 ----
        else
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
        fi
!       exit ;;
!     i*86:*:5:[678]*)
!       # UnixWare 7.x, OpenUNIX and OpenServer 6.
        case `/bin/uname -X | grep "^Machine"` in
            *486*)           UNAME_MACHINE=i486 ;;
            *Pentium)        UNAME_MACHINE=i586 ;;
            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
        esac
        echo ${UNAME_MACHINE}-unknown-sysv
${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
!       exit ;;
      i*86:*:3.2:*)
        if test -f /usr/options/cb.name; then
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
***************
*** 968,1046 ****
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
!       exit 0 ;;
!     i*86:*DOS:*:*)
!       echo ${UNAME_MACHINE}-pc-msdosdjgpp
!       exit 0 ;;
      pc:*:*:*)
        # Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing
about
          # the processor, so we play safe by assuming i386.
        echo i386-pc-msdosdjgpp
!         exit 0 ;;
      Intel:Mach:3*:*)
        echo i386-pc-mach3
!       exit 0 ;;
      paragon:*:*:*)
        echo i860-intel-osf1
!       exit 0 ;;
      i860:*:4.*:*) # i860-SVR4
        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
          echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
        else # Add other i860-SVR4 vendors below as they are discovered.
          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
        fi
!       exit 0 ;;
      mini*:CTIX:SYS*5:*)
        # "miniframe"
        echo m68010-convergent-sysv
!       exit 0 ;;
      mc68k:UNIX:SYSTEM5:3.51m)
        echo m68k-convergent-sysv
!       exit 0 ;;
      M680?0:D-NIX:5.3:*)
        echo m68k-diab-dnix
!       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)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p'
< /etc/.relid`
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
!         && echo i486-ncr-sysv4.3${OS_REL} && exit 0
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
!         && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
!           && echo i486-ncr-sysv4 && exit 0 ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
        echo m68k-unknown-lynxos${UNAME_RELEASE}
!       exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
!       exit 0 ;;
!     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
!       echo i386-unknown-lynxos${UNAME_RELEASE}
!       exit 0 ;;
      TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
!       exit 0 ;;
      rs6000:LynxOS:2.*:*)
        echo rs6000-unknown-lynxos${UNAME_RELEASE}
!       exit 0 ;;
      PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* |
PowerPC:LynxOS:4.0*:*)
        echo powerpc-unknown-lynxos${UNAME_RELEASE}
!       exit 0 ;;
      SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
!       exit 0 ;;
      RM*:ReliantUNIX-*:*:*)
        echo mips-sni-sysv4
!       exit 0 ;;
      RM*:SINIX-*:*:*)
        echo mips-sni-sysv4
!       exit 0 ;;
      *:SINIX-*:*:*)
        if uname -p 2>/dev/null >/dev/null ; then
                UNAME_MACHINE=`(uname -p) 2>/dev/null`
--- 1049,1121 ----
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
!       exit ;;
      pc:*:*:*)
        # Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing
about
          # the processor, so we play safe by assuming i386.
        echo i386-pc-msdosdjgpp
!         exit ;;
      Intel:Mach:3*:*)
        echo i386-pc-mach3
!       exit ;;
      paragon:*:*:*)
        echo i860-intel-osf1
!       exit ;;
      i860:*:4.*:*) # i860-SVR4
        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
          echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
        else # Add other i860-SVR4 vendors below as they are discovered.
          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
        fi
!       exit ;;
      mini*:CTIX:SYS*5:*)
        # "miniframe"
        echo m68010-convergent-sysv
!       exit ;;
      mc68k:UNIX:SYSTEM5:3.51m)
        echo m68k-convergent-sysv
!       exit ;;
      M680?0:D-NIX:5.3:*)
        echo m68k-diab-dnix
!       exit ;;
!     M68*:*:R3V[5678]*:*)
!       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
!     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 | S7501*:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p'
< /etc/.relid`
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
!         && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
!         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
!           && { echo i486-ncr-sysv4; exit; } ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
        echo m68k-unknown-lynxos${UNAME_RELEASE}
!       exit ;;
      mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
!       exit ;;
      TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
!       exit ;;
      rs6000:LynxOS:2.*:*)
        echo rs6000-unknown-lynxos${UNAME_RELEASE}
!       exit ;;
      PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* |
PowerPC:LynxOS:4.0*:*)
        echo powerpc-unknown-lynxos${UNAME_RELEASE}
!       exit ;;
      SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
!       exit ;;
      RM*:ReliantUNIX-*:*:*)
        echo mips-sni-sysv4
!       exit ;;
      RM*:SINIX-*:*:*)
        echo mips-sni-sysv4
!       exit ;;
      *:SINIX-*:*:*)
        if uname -p 2>/dev/null >/dev/null ; then
                UNAME_MACHINE=`(uname -p) 2>/dev/null`
***************
*** 1048,1111 ****
        else
                echo ns32k-sni-sysv
        fi
!       exit 0 ;;
      PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                        # says <address@hidden>
          echo i586-unisys-sysv4
!         exit 0 ;;
      *:UNIX_System_V:4*:FTX*)
        # From Gerald Hewes <address@hidden>.
        # How about differentiating between stratus architectures? -djm
        echo hppa1.1-stratus-sysv4
!       exit 0 ;;
      *:*:*:FTX*)
        # From address@hidden
        echo i860-stratus-sysv4
!       exit 0 ;;
      *:VOS:*:*)
        # From address@hidden
        echo hppa1.1-stratus-vos
!       exit 0 ;;
      mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
!       exit 0 ;;
      news*:NEWS-OS:6*:*)
        echo mips-sony-newsos6
!       exit 0 ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
        if [ -d /usr/nec ]; then
                echo mips-nec-sysv${UNAME_RELEASE}
        else
                echo mips-unknown-sysv${UNAME_RELEASE}
        fi
!         exit 0 ;;
      BeBox:BeOS:*:*)   # BeOS running on hardware made by Be, PPC only.
        echo powerpc-be-beos
!       exit 0 ;;
      BeMac:BeOS:*:*)   # BeOS running on Mac or Mac clone, PPC only.
        echo powerpc-apple-beos
!       exit 0 ;;
      BePC:BeOS:*:*)    # BeOS running on Intel PC compatible.
        echo i586-pc-beos
!       exit 0 ;;
      SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
!       exit 0 ;;
      SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
!       exit 0 ;;
      SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
!       exit 0 ;;
      Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
!       exit 0 ;;
      *:Rhapsody:*:*)
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
!       exit 0 ;;
      *:Darwin:*:*)
!       echo `uname -p`-apple-darwin${UNAME_RELEASE}
!       exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
        UNAME_PROCESSOR=`uname -p`
        if test "$UNAME_PROCESSOR" = "x86"; then
--- 1123,1195 ----
        else
                echo ns32k-sni-sysv
        fi
!       exit ;;
      PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                        # says <address@hidden>
          echo i586-unisys-sysv4
!         exit ;;
      *:UNIX_System_V:4*:FTX*)
        # From Gerald Hewes <address@hidden>.
        # How about differentiating between stratus architectures? -djm
        echo hppa1.1-stratus-sysv4
!       exit ;;
      *:*:*:FTX*)
        # From address@hidden
        echo i860-stratus-sysv4
!       exit ;;
!     i*86:VOS:*:*)
!       # From address@hidden
!       echo ${UNAME_MACHINE}-stratus-vos
!       exit ;;
      *:VOS:*:*)
        # From address@hidden
        echo hppa1.1-stratus-vos
!       exit ;;
      mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
!       exit ;;
      news*:NEWS-OS:6*:*)
        echo mips-sony-newsos6
!       exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
        if [ -d /usr/nec ]; then
                echo mips-nec-sysv${UNAME_RELEASE}
        else
                echo mips-unknown-sysv${UNAME_RELEASE}
        fi
!         exit ;;
      BeBox:BeOS:*:*)   # BeOS running on hardware made by Be, PPC only.
        echo powerpc-be-beos
!       exit ;;
      BeMac:BeOS:*:*)   # BeOS running on Mac or Mac clone, PPC only.
        echo powerpc-apple-beos
!       exit ;;
      BePC:BeOS:*:*)    # BeOS running on Intel PC compatible.
        echo i586-pc-beos
!       exit ;;
      SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
!       exit ;;
      SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
!       exit ;;
      SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
!       exit ;;
      Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
!       exit ;;
      *:Rhapsody:*:*)
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
!       exit ;;
      *:Darwin:*:*)
!       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
!       case $UNAME_PROCESSOR in
!           *86) UNAME_PROCESSOR=i686 ;;
!           unknown) UNAME_PROCESSOR=powerpc ;;
!       esac
!       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
!       exit ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
        UNAME_PROCESSOR=`uname -p`
        if test "$UNAME_PROCESSOR" = "x86"; then
***************
*** 1113,1134 ****
                UNAME_MACHINE=pc
        fi
        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
!       exit 0 ;;
      *:QNX:*:4*)
        echo i386-pc-qnx
!       exit 0 ;;
!     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
!       exit 0 ;;
      *:NonStop-UX:*:*)
        echo mips-compaq-nonstopux
!       exit 0 ;;
      BS2000:POSIX*:*:*)
        echo bs2000-siemens-sysv
!       exit 0 ;;
      DS/*:UNIX_System_V:*:*)
        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
!       exit 0 ;;
      *:Plan9:*:*)
        # "uname -m" is not consistent, so use $cputype instead. 386
        # is converted to i386 for consistency with other x86
--- 1197,1221 ----
                UNAME_MACHINE=pc
        fi
        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
!       exit ;;
      *:QNX:*:4*)
        echo i386-pc-qnx
!       exit ;;
!     NSE-?:NONSTOP_KERNEL:*:*)
!       echo nse-tandem-nsk${UNAME_RELEASE}
!       exit ;;
!     NSR-?:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
!       exit ;;
      *:NonStop-UX:*:*)
        echo mips-compaq-nonstopux
!       exit ;;
      BS2000:POSIX*:*:*)
        echo bs2000-siemens-sysv
!       exit ;;
      DS/*:UNIX_System_V:*:*)
        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
!       exit ;;
      *:Plan9:*:*)
        # "uname -m" is not consistent, so use $cputype instead. 386
        # is converted to i386 for consistency with other x86
***************
*** 1139,1174 ****
            UNAME_MACHINE="$cputype"
        fi
        echo ${UNAME_MACHINE}-unknown-plan9
!       exit 0 ;;
!     i*86:OS/2:*:*)
!       # If we were able to find `uname', then EMX Unix compatibility
!       # is probably installed.
!       echo ${UNAME_MACHINE}-pc-os2-emx
!       exit 0 ;;
      *:TOPS-10:*:*)
        echo pdp10-unknown-tops10
!       exit 0 ;;
      *:TENEX:*:*)
        echo pdp10-unknown-tenex
!       exit 0 ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
        echo pdp10-dec-tops20
!       exit 0 ;;
      XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
        echo pdp10-xkl-tops20
!       exit 0 ;;
      *:TOPS-20:*:*)
        echo pdp10-unknown-tops20
!       exit 0 ;;
      *:ITS:*:*)
        echo pdp10-unknown-its
!       exit 0 ;;
!     i*86:XTS-300:*:STOP)
!       echo ${UNAME_MACHINE}-unknown-stop
!       exit 0 ;;
!     i*86:atheos:*:*)
!       echo ${UNAME_MACHINE}-unknown-atheos
!       exit 0 ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
--- 1226,1269 ----
            UNAME_MACHINE="$cputype"
        fi
        echo ${UNAME_MACHINE}-unknown-plan9
!       exit ;;
      *:TOPS-10:*:*)
        echo pdp10-unknown-tops10
!       exit ;;
      *:TENEX:*:*)
        echo pdp10-unknown-tenex
!       exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
        echo pdp10-dec-tops20
!       exit ;;
      XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
        echo pdp10-xkl-tops20
!       exit ;;
      *:TOPS-20:*:*)
        echo pdp10-unknown-tops20
!       exit ;;
      *:ITS:*:*)
        echo pdp10-unknown-its
!       exit ;;
!     SEI:*:*:SEIUX)
!         echo mips-sei-seiux${UNAME_RELEASE}
!       exit ;;
!     *:DragonFly:*:*)
!       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
!       exit ;;
!     *:*VMS:*:*)
!       UNAME_MACHINE=`(uname -p) 2>/dev/null`
!       case "${UNAME_MACHINE}" in
!           A*) echo alpha-dec-vms ; exit ;;
!           I*) echo ia64-dec-vms ; exit ;;
!           V*) echo vax-dec-vms ; exit ;;
!       esac ;;
!     *:XENIX:*:SysV)
!       echo i386-pc-xenix
!       exit ;;
!     i*86:skyos:*:*)
!       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*
$//'
!       exit ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
***************
*** 1200,1206 ****
  #endif
  
  #if defined (__arm) && defined (__acorn) && defined (__unix)
!   printf ("arm-acorn-riscix"); exit (0);
  #endif
  
  #if defined (hp300) && !defined (hpux)
--- 1295,1301 ----
  #endif
  
  #if defined (__arm) && defined (__acorn) && defined (__unix)
!   printf ("arm-acorn-riscix\n"); exit (0);
  #endif
  
  #if defined (hp300) && !defined (hpux)
***************
*** 1289,1300 ****
  }
  EOF
  
! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f
$dummy.c $dummy && rmdir $tmpdir && exit 0
! rm -f $dummy.c $dummy && rmdir $tmpdir
  
  # Apollos put the system type in the environment.
  
! test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
  
  # Convex versions that predate uname can use getsysinfo(1)
  
--- 1384,1395 ----
  }
  EOF
  
! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy`
&&
!       { echo "$SYSTEM_NAME"; exit; }
  
  # Apollos put the system type in the environment.
  
! test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
  
  # Convex versions that predate uname can use getsysinfo(1)
  
***************
*** 1303,1324 ****
      case `getsysinfo -f cpu_type` in
      c1*)
        echo c1-convex-bsd
!       exit 0 ;;
      c2*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
!       exit 0 ;;
      c34*)
        echo c34-convex-bsd
!       exit 0 ;;
      c38*)
        echo c38-convex-bsd
!       exit 0 ;;
      c4*)
        echo c4-convex-bsd
!       exit 0 ;;
      esac
  fi
  
--- 1398,1419 ----
      case `getsysinfo -f cpu_type` in
      c1*)
        echo c1-convex-bsd
!       exit ;;
      c2*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
!       exit ;;
      c34*)
        echo c34-convex-bsd
!       exit ;;
      c38*)
        echo c38-convex-bsd
!       exit ;;
      c4*)
        echo c4-convex-bsd
!       exit ;;
      esac
  fi
  
***************
*** 1329,1335 ****
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
!     ftp://ftp.gnu.org/pub/gnu/config/
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
--- 1424,1432 ----
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
!
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
! and
!
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
Index: emacs/config.sub
===================================================================
RCS file: /cvsroot/emacs/emacs/config.sub,v
retrieving revision 1.159
diff -c -r1.159 config.sub
*** emacs/config.sub    4 Jul 2005 14:04:09 -0000       1.159
--- emacs/config.sub    24 Aug 2005 20:46:15 -0000
***************
*** 1,9 ****
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002 Free Software Foundation, Inc.
  
! timestamp='2002-11-13'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU
software
--- 1,9 ----
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
! timestamp='2005-07-08'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU
software
***************
*** 21,34 ****
  #
  # 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., 51 Franklin Street, Fifth Floor,
! # Boston, MA 02110-1301, USA.
! 
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that
program.
  
  # Please send patches to <address@hidden>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
  #
--- 21,35 ----
  #
  # 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., 51 Franklin Street - Fifth Floor, Boston, MA
! # 02110-1301, USA.
! #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that
program.
  
+ 
  # Please send patches to <address@hidden>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
  #
***************
*** 70,76 ****
  version="\
  GNU config.sub ($timestamp)
  
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There
is NO
--- 71,77 ----
  version="\
  GNU config.sub ($timestamp)
  
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There
is NO
***************
*** 83,93 ****
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
!        echo "$timestamp" ; exit 0 ;;
      --version | -v )
!        echo "$version" ; exit 0 ;;
      --help | --h* | -h )
!        echo "$usage"; exit 0 ;;
      -- )     # Stop option processing
         shift; break ;;
      - )       # Use stdin as input.
--- 84,94 ----
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
!        echo "$timestamp" ; exit ;;
      --version | -v )
!        echo "$version" ; exit ;;
      --help | --h* | -h )
!        echo "$usage"; exit ;;
      -- )     # Stop option processing
         shift; break ;;
      - )       # Use stdin as input.
***************
*** 99,105 ****
      *local*)
         # First pass through any local machine types.
         echo $1
!        exit 0;;
  
      * )
         break ;;
--- 100,106 ----
      *local*)
         # First pass through any local machine types.
         echo $1
!        exit ;;
  
      * )
         break ;;
***************
*** 118,124 ****
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* |
windows32-* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
--- 119,126 ----
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* |
uclinux-uclibc* | uclinux-gnu* | \
!   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* |
os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
***************
*** 144,150 ****
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* |
\
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
!       -apple | -axis)
                os=
                basic_machine=$1
                ;;
--- 146,152 ----
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* |
\
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
!       -apple | -axis | -knuth | -cray)
                os=
                basic_machine=$1
                ;;
***************
*** 228,241 ****
        | a29k \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr
\
!       | clipper \
        | d10v | d30v | dlx | dsp16xx \
        | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64
\
        | i370 | i860 | i960 | ia64 \
!       | ip2k \
!       | m32r | m68000 | m68k | m88k | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
--- 230,245 ----
        | a29k \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
+       | am33_2.0 \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr
\
!       | bfin \
!       | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
        | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64
\
        | i370 | i860 | i960 | ia64 \
!       | ip2k | iq2000 \
!       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
***************
*** 244,271 ****
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64vr5000 | mips64vr5000el \
        | mipsisa32 | mipsisa32el \
        | mipsisa64 | mipsisa64el \
        | mipsisa64sb1 | mipsisa64sb1el \
        | mipsisa64sr71k | mipsisa64sr71kel \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
        | ns16k | ns32k \
!       | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
!       | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele
\
        | sh64 | sh64le \
!       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 |
sparcv9b \
        | strongarm \
!       | tahoe | thumb | tic80 | tron \
        | v850 | v850e \
        | we32k \
!       | x86 | xscale | xstormy16 | xtensa \
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
        m6811 | m68hc11 | m6812 | m68hc12)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
--- 248,284 ----
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64vr5000 | mips64vr5000el \
+       | mips64vr5900 | mips64vr5900el \
        | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
        | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
        | mipsisa64sb1 | mipsisa64sb1el \
        | mipsisa64sr71k | mipsisa64sr71kel \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
+       | ms1 \
+       | msp430 \
        | ns16k | ns32k \
!       | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
!       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle |
sh[1234]le | sh3ele \
        | sh64 | sh64le \
!       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
!       | sparcv8 | sparcv9 | sparcv9b \
        | strongarm \
!       | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
!       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
+       m32c)
+               basic_machine=$basic_machine-unknown
+               ;;
        m6811 | m68hc11 | m6812 | m68hc12)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
***************
*** 293,311 ****
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
!       | bs2000-* \
!       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
!       | clipper-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
!       | ip2k-* \
!       | m32r-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
!       | m88110-* | m88k-* | mcore-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
--- 306,324 ----
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
!       | bfin-* | bs2000-* \
!       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
!       | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
!       | ip2k-* | iq2000-* \
!       | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
!       | m88110-* | m88k-* | maxq-* | mcore-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
***************
*** 314,342 ****
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64vr5000-* | mips64vr5000el-* \
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa64-* | mipsisa64el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
!       | mipstx39 | mipstx39el \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
!       | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
!       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
!       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
!       | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-*
\
        | v850-* | v850e-* | vax-* \
        | we32k-* \
!       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
!       | xtensa-* \
        | ymp-* \
        | z8k-*)
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
--- 327,366 ----
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64vr5000-* | mips64vr5000el-* \
+       | mips64vr5900-* | mips64vr5900el-* \
        | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
        | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
!       | mipstx39-* | mipstx39el-* \
!       | mmix-* \
!       | ms1-* \
!       | msp430-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
!       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
!       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
!       | sparclite-* \
!       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
!       | tahoe-* | thumb-* \
!       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
!       | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
!       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
!       | xstormy16-* | xtensa-* \
        | ymp-* \
        | z8k-*)
                ;;
+       m32c-*)
+               ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
***************
*** 353,358 ****
--- 377,385 ----
                basic_machine=a29k-amd
                os=-udi
                ;;
+       abacus)
+               basic_machine=abacus-unknown
+               ;;
        adobe68k)
                basic_machine=m68010-adobe
                os=-scout
***************
*** 367,372 ****
--- 394,405 ----
                basic_machine=a29k-none
                os=-bsd
                ;;
+       amd64)
+               basic_machine=x86_64-pc
+               ;;
+       amd64-*)
+               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        amdahl)
                basic_machine=580-amdahl
                os=-sysv
***************
*** 426,437 ****
--- 459,485 ----
                basic_machine=j90-cray
                os=-unicos
                ;;
+       craynv)
+               basic_machine=craynv-cray
+               os=-unicosmp
+               ;;
+       cr16c)
+               basic_machine=cr16c-unknown
+               os=-elf
+               ;;
        crds | unos)
                basic_machine=m68k-crds
                ;;
+       crisv32 | crisv32-* | etraxfs*)
+               basic_machine=crisv32-axis
+               ;;
        cris | cris-* | etrax*)
                basic_machine=cris-axis
                ;;
+       crx)
+               basic_machine=crx-unknown
+               os=-elf
+               ;;
        da30 | da30-*)
                basic_machine=m68k-da30
                ;;
***************
*** 454,459 ****
--- 502,511 ----
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
+       djgpp)
+               basic_machine=i586-pc
+               os=-msdosdjgpp
+               ;;
        dpx20 | dpx20-*)
                basic_machine=rs6000-bull
                os=-bosx
***************
*** 632,641 ****
        mips3*)
                basic_machine=`echo $basic_machine | sed -e
's/mips3/mips64/'`-unknown
                ;;
-       mmix*)
-               basic_machine=mmix-knuth
-               os=-mmixware
-               ;;
        monitor)
                basic_machine=m68k-rom68k
                os=-coff
--- 684,689 ----
***************
*** 723,731 ****
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
!       or32 | or32-*)
                basic_machine=or32-unknown
!               os=-coff
                ;;
        OSE68000 | ose68000)
                basic_machine=m68000-ericsson
--- 771,782 ----
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
!       openrisc | openrisc-*)
                basic_machine=or32-unknown
!               ;;
!       os400)
!               basic_machine=powerpc-ibm
!               os=-os400
                ;;
        OSE68000 | ose68000)
                basic_machine=m68000-ericsson
***************
*** 758,775 ****
        pentiumpro | p6 | 6x86 | athlon | athlon_*)
                basic_machine=i686-pc
                ;;
!       pentiumii | pentium2)
                basic_machine=i686-pc
                ;;
        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pentiumpro-* | p6-* | 6x86-* | athlon-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
!       pentiumii-* | pentium2-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pn)
                basic_machine=pn-gould
                ;;
--- 809,832 ----
        pentiumpro | p6 | 6x86 | athlon | athlon_*)
                basic_machine=i686-pc
                ;;
!       pentiumii | pentium2 | pentiumiii | pentium3)
                basic_machine=i686-pc
                ;;
+       pentium4)
+               basic_machine=i786-pc
+               ;;
        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pentiumpro-* | p6-* | 6x86-* | athlon-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
!       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
+       pentium4-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        pn)
                basic_machine=pn-gould
                ;;
***************
*** 828,833 ****
--- 885,894 ----
        sb1el)
                basic_machine=mipsisa64sb1el-unknown
                ;;
+       sei)
+               basic_machine=mips-sei
+               os=-seiux
+               ;;
        sequent)
                basic_machine=i386-sequent
                ;;
***************
*** 835,840 ****
--- 896,904 ----
                basic_machine=sh-hitachi
                os=-hms
                ;;
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
        sparclite-wrs | simso-wrs)
                basic_machine=sparclite-wrs
                os=-vxworks
***************
*** 901,910 ****
                basic_machine=i386-sequent
                os=-dynix
                ;;
-       t3d)
-               basic_machine=alpha-cray
-               os=-unicos
-               ;;
        t3e)
                basic_machine=alphaev5-cray
                os=-unicos
--- 965,970 ----
***************
*** 913,926 ****
                basic_machine=t90-cray
                os=-unicos
                ;;
-         tic4x | c4x*)
-               basic_machine=tic4x-unknown
-               os=-coff
-               ;;
        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff
                ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
--- 973,990 ----
                basic_machine=t90-cray
                os=-unicos
                ;;
        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff
                ;;
+       tic55x | c55x*)
+               basic_machine=tic55x-unknown
+               os=-coff
+               ;;
+       tic6x | c6x*)
+               basic_machine=tic6x-unknown
+               os=-coff
+               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
***************
*** 934,939 ****
--- 998,1007 ----
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
+       tpf)
+               basic_machine=s390x-ibm
+               os=-tpf
+               ;;
        udi29k)
                basic_machine=a29k-amd
                os=-udi
***************
*** 977,982 ****
--- 1045,1054 ----
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
+       xbox)
+               basic_machine=i686-pc
+               os=-mingw32
+               ;;
        xps | xps100)
                basic_machine=xps100-honeywell
                ;;
***************
*** 1007,1012 ****
--- 1079,1087 ----
        romp)
                basic_machine=romp-ibm
                ;;
+       mmix)
+               basic_machine=mmix-knuth
+               ;;
        rs6000)
                basic_machine=rs6000-ibm
                ;;
***************
*** 1023,1035 ****
        we32k)
                basic_machine=we32k-att
                ;;
!       sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
                basic_machine=sh-unknown
                ;;
!       sh64)
!               basic_machine=sh64-unknown
!               ;;
!       sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        cydra)
--- 1098,1107 ----
        we32k)
                basic_machine=we32k-att
                ;;
!       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
!       sparc | sparcv8 | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        cydra)
***************
*** 1102,1120 ****
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
!             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* |
-riscix* \
!             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* |
-oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
!             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened*
\
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
!             | -powermax* | -dnix*)
        # Remember, each alternative MUST END IN *, to match a version
number.
                ;;
        -qnx*)
--- 1174,1194 ----
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
!             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* |
-openbsd* \
!             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
!             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
!             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* |
-mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened*
\
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
!             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
!             | -skyos* | -haiku*)
        # Remember, each alternative MUST END IN *, to match a version
number.
                ;;
        -qnx*)
***************
*** 1126,1141 ****
                        ;;
                esac
                ;;
        -nto*)
!               os=-nto-qnx
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
!             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                ;;
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
--- 1200,1220 ----
                        ;;
                esac
                ;;
+       -nto-qnx*)
+               ;;
        -nto*)
!               os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
!             | -windows* | -osx | -abug | -netware* | -os9* | -beos* |
-haiku* \
              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                ;;
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
***************
*** 1148,1153 ****
--- 1227,1235 ----
        -opened*)
                os=-openedition
                ;;
+         -os400*)
+               os=-os400
+               ;;
        -wince*)
                os=-wince
                ;;
***************
*** 1169,1174 ****
--- 1251,1259 ----
        -atheos*)
                os=-atheos
                ;;
+       -syllable*)
+               os=-syllable
+               ;;
        -386bsd)
                os=-bsd
                ;;
***************
*** 1191,1196 ****
--- 1276,1284 ----
        -sinix*)
                os=-sysv4
                ;;
+         -tpf*)
+               os=-tpf
+               ;;
        -triton*)
                os=-sysv3
                ;;
***************
*** 1221,1226 ****
--- 1309,1323 ----
        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                os=-mint
                ;;
+       -aros*)
+               os=-aros
+               ;;
+       -kaos*)
+               os=-kaos
+               ;;
+       -zvmoe)
+               os=-zvmoe
+               ;;
        -none)
                ;;
        *)
***************
*** 1252,1257 ****
--- 1349,1357 ----
        arm*-semi)
                os=-aout
                ;;
+     c4x-* | tic4x-*)
+         os=-coff
+         ;;
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
***************
*** 1295,1303 ****
--- 1395,1409 ----
        *-be)
                os=-beos
                ;;
+       *-haiku)
+               os=-haiku
+               ;;
        *-ibm)
                os=-aix
                ;;
+       *-knuth)
+               os=-mmixware
+               ;;
        *-wec)
                os=-proelf
                ;;
***************
*** 1430,1438 ****
--- 1536,1550 ----
                        -mvs* | -opened*)
                                vendor=ibm
                                ;;
+                       -os400*)
+                               vendor=ibm
+                               ;;
                        -ptx*)
                                vendor=sequent
                                ;;
+                       -tpf*)
+                               vendor=ibm
+                               ;;
                        -vxsim* | -vxworks* | -windiss*)
                                vendor=wrs
                                ;;
***************
*** 1457,1463 ****
  esac
  
  echo $basic_machine$os
! exit 0
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
--- 1569,1575 ----
  esac
  
  echo $basic_machine$os
! exit
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
Index: emacs/configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.395
diff -c -r1.395 configure.in
*** emacs/configure.in  26 Jul 2005 21:43:11 -0000      1.395
--- emacs/configure.in  24 Aug 2005 20:46:16 -0000
***************
*** 282,287 ****
--- 282,296 ----
      esac
    ;;
  
+   ## LynxOS ports
+   *-*-lynxos* )
+     opsys=lynxos
+     case "${canonical}" in
+       i[3456]86-*-lynxos*) machine=intel386 ;;
+       powerpc-*-lynxos*) machine=powerpc ;;
+     esac
+   ;;
+ 
    ## Acorn RISCiX:
    arm-acorn-riscix1.1* )
      machine=acorn opsys=riscix1-1
***************
*** 1083,1089 ****
        *-darwin )                opsys=darwin
                                  CPP="${CC-cc} -E -no-cpp-precomp"
                                ;;
-       *-lynxos* )               opsys=lynxos ;;
        *-isc1.* | *-isc2.[01]* )       opsys=386-ix ;;
        *-isc2.2* )             opsys=isc2-2 ;;
        *-isc4.0* )             opsys=isc4-0 ;;
--- 1092,1097 ----
Index: emacs/lib-src/etags.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/etags.c,v
retrieving revision 3.46
diff -c -r3.46 etags.c
*** emacs/lib-src/etags.c       7 Aug 2005 10:44:16 -0000       3.46
--- emacs/lib-src/etags.c       24 Aug 2005 20:46:16 -0000
***************
*** 476,481 ****
--- 476,486 ----
  static bool ignoreindent;     /* -I: ignore indentation in C */
  static bool packages_only;    /* --packages-only: in Ada, only tag
packages*/
  
+ /* STDIN is defined in LynxOS system headers */
+ #ifdef STDIN
+ #undef STDIN
+ #endif
+ 
  #define STDIN 0x1001          /* returned by getopt_long on --parse-stdin */
  static bool parsing_stdin;    /* --parse-stdin used */
  
Index: emacs/src/syssignal.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/syssignal.h,v
retrieving revision 1.41
diff -c -r1.41 syssignal.h
*** emacs/src/syssignal.h       7 Aug 2005 12:33:18 -0000       1.41
--- emacs/src/syssignal.h       24 Aug 2005 20:46:16 -0000
***************
*** 146,152 ****
  #undef SIGINFO
  #endif
  #if defined (SIGIO) && defined (BROKEN_SIGIO)
! #undef SIGIO
  #endif
  #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL)
  #undef SIGPOLL
--- 146,155 ----
  #undef SIGINFO
  #endif
  #if defined (SIGIO) && defined (BROKEN_SIGIO)
! # undef SIGIO
! # if defined (__Lynx__)
! # undef SIGPOLL /* Defined as SIGIO on LynxOS */
! # endif
  #endif
  #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL)
  #undef SIGPOLL
Index: emacs/src/s/lynxos.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/s/lynxos.h,v
retrieving revision 1.5
diff -c -r1.5 lynxos.h
*** emacs/src/s/lynxos.h        7 Aug 2005 10:08:10 -0000       1.5
--- emacs/src/s/lynxos.h        24 Aug 2005 20:46:16 -0000
***************
*** 27,33 ****
  
  /* override the bsd definition */
  #undef SYSTEM_TYPE
! #define SYSTEM_TYPE "lynxos 3.0.1"
  
  /* System stuff redefined from bsd4-2.h */
  #undef KERNEL_FILE
--- 27,34 ----
  
  /* override the bsd definition */
  #undef SYSTEM_TYPE
! /*#define SYSTEM_TYPE "lynxos 3.0.1" */
! #define SYSTEM_TYPE "lynxos 4.0.0"
  
  /* System stuff redefined from bsd4-2.h */
  #undef KERNEL_FILE
***************
*** 39,44 ****
--- 40,46 ----
  #define GETPGRP_NO_ARG
  #define LNOFLSH 0
  
+ #if 0
  /* COFF related */
  #define COFF
  #define NO_REMAP
***************
*** 47,52 ****
--- 49,65 ----
  #define etext __etext
  #define edata __edata
  #define _start __text
+ #else
+ /* ELF related. Added for LynxOS 4.0.0 */
+ #define ld_switch_system_1
+ #define UNEXEC_SRC unexelf.c
+ #define UNEXEC unexelf.o
+ #undef lib_gcc
+ #define lib_gcc -lgcc
+ #define etext _etext
+ #define edata _edata
+ #endif
+ #define SYSTEM_MALLOC
  
  /* Compilation options */
  #define LIBS_DEBUG
***************
*** 55,60 ****
--- 68,78 ----
  /* warning messages */
  #define C_SWITCH_SYSTEM -D__NO_INCLUDE_WARN__
  #define LIBS_SYSTEM -lbsd
+ 
+ /* Added for LynxOS 4.0.0 */
+ #define XLIB_ILLEGAL_ACCESS
+ #define BROKEN_SIGIO
+ #define USE_MMAP_FOR_BUFFERS 1
  
  /* arch-tag: fbc81ec9-1c45-416b-a368-799ae7c094a1
     (do not change this comment) */






reply via email to

[Prev in Thread] Current Thread [Next in Thread]