emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] Changes to emacs/config.guess


From: Paul Eggert
Subject: [Emacs-diffs] Changes to emacs/config.guess
Date: Mon, 27 May 2002 02:43:19 -0400

Index: emacs/config.guess
diff -c emacs/config.guess:1.124 emacs/config.guess:1.125
*** emacs/config.guess:1.124    Sat Nov 11 10:57:44 2000
--- emacs/config.guess  Mon May 27 02:43:19 2002
***************
*** 1,9 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
! #   Free Software Foundation, Inc.
  
! version='2000-11-10'
  
  # 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 Free Software Foundation, Inc.
  
! timestamp='2002-05-22'
  
  # 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
***************
*** 24,61 ****
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
! # Written by Per Bothner <address@hidden>.
! # Please send patches to <address@hidden>.
  #
  # This script attempts to guess a canonical system name similar to
  # config.sub.  If it succeeds, it prints the system name on stdout, and
  # exits with 0.  Otherwise, it exits with 1.
  #
  # The plan is that this can be called by configure scripts if you
! # don't specify an explicit system type (host/target name).
! #
! # Only a few systems have been added to this list; please add others
! # (but try to keep the structure clean).
! #
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
  usage="\
  Usage: $0 [OPTION]
  
! Output the configuration name of this system.
  
  Operation modes:
!   -h, --help               print this help, then exit
!   -V, --version            print version number, then exit"
  
  help="
  Try \`$me --help' for more information."
  
  # Parse command line
  while test $# -gt 0 ; do
!   case "$1" in
!     --version | --vers* | -V )
         echo "$version" ; exit 0 ;;
      --help | --h* | -h )
         echo "$usage"; exit 0 ;;
--- 24,73 ----
  # 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.
  #
  # This script attempts to guess a canonical system name similar to
  # config.sub.  If it succeeds, it prints the system name on stdout, and
  # exits with 0.  Otherwise, it exits with 1.
  #
  # The plan is that this can be called by configure scripts if you
! # don't specify an explicit build system type.
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
  usage="\
  Usage: $0 [OPTION]
  
! Output the configuration name of the system \`$me' is run on.
  
  Operation modes:
!   -h, --help         print this help, then exit
!   -t, --time-stamp   print date of last modification, then exit
!   -v, --version      print version number, then exit
! 
! Report bugs and patches to <address@hidden>."
! 
! version="\
! 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
! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  
  help="
  Try \`$me --help' for more information."
  
  # Parse command line
  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 ;;
***************
*** 64,72 ****
      - )       # Use stdin as input.
         break ;;
      -* )
!        exec >&2
!        echo "$me: invalid option $1"
!        echo "$help"
         exit 1 ;;
      * )
         break ;;
--- 76,82 ----
      - )       # Use stdin as input.
         break ;;
      -* )
!        echo "$me: invalid option $1$help" >&2
         exit 1 ;;
      * )
         break ;;
***************
*** 80,155 ****
  
  
  dummy=dummy-$$
! trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
  
! # Use $HOST_CC if defined. $CC may point to a cross-compiler
! if test x"$CC_FOR_BUILD" = x; then
!   if test x"$HOST_CC" != x; then
!     CC_FOR_BUILD="$HOST_CC"
!   else
!     if test x"$CC" != x; then
!       CC_FOR_BUILD="$CC"
!     else
!       echo 'int dummy(){}' >$dummy.c
!       for c in cc c89 gcc; do 
!       ($c $dummy.c -c) >/dev/null 2>&1
!       if test $? = 0; then
!         CC_FOR_BUILD="$c"; break
        fi
!       done
!       rm -f $dummy.c $dummy.o
!       if test x"$CC_FOR_BUILD" = x; then
!       CC_FOR_BUILD=no_compiler_found
!       fi
!     fi
!   fi
! fi
! 
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
! # (address@hidden 8/24/94.)
  if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
        PATH=$PATH:/.attbin ; export PATH
  fi
  
  UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
! UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
!       # Netbsd (nbsd) targets should (where applicable) match one or
        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
        # switched to ELF, *-*-netbsd* would select the old
        # object file format.  This provides both forward
        # compatibility and a consistent mechanism for selecting the
        # object file format.
!       # Determine the machine/vendor (is the vendor relevant).
!       case "${UNAME_MACHINE}" in
!           amiga) machine=m68k-unknown ;;
!           arm32) machine=arm-unknown ;;
!           atari*) machine=m68k-atari ;;
!           sun3*) machine=m68k-sun ;;
!           mac68k) machine=m68k-apple ;;
!           macppc) machine=powerpc-apple ;;
!           hp3[0-9][05]) machine=m68k-hp ;;
!           ibmrt|romp-ibm) machine=romp-ibm ;;
!           *) machine=${UNAME_MACHINE}-unknown ;;
        esac
-       # The Operating System including object format.
-       if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-               | grep __ELF__ >/dev/null
-       then
-           # Once all utilities can be ECOFF (netbsdecoff) or a.out 
(netbsdaout).
-           # Return netbsd for either.  FIX?
-           os=netbsd
-       else
-           os=netbsdelf
-       fi
        # The OS release
        release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
--- 90,172 ----
  
  
  dummy=dummy-$$
! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
  
! # CC_FOR_BUILD -- compiler used by this script.
! # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
! # use `HOST_CC' if defined, but it is deprecated.
! 
! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
!  ,,)    echo "int dummy(){}" > $dummy.c ;
!       for c in cc gcc c89 c99 ; do
!         ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
!         if test $? = 0 ; then
!            CC_FOR_BUILD="$c"; break ;
!         fi ;
!       done ;
!       rm -f $dummy.c $dummy.o $dummy.rel ;
!       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'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
! # (address@hidden 1994-08-24)
  if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
        PATH=$PATH:/.attbin ; export PATH
  fi
  
  UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
! UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
!       # NetBSD (nbsd) targets should (where applicable) match one or
        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
        # switched to ELF, *-*-netbsd* would select the old
        # object file format.  This provides both forward
        # compatibility and a consistent mechanism for selecting the
        # object file format.
!       #
!       # Note: NetBSD doesn't particularly care about the vendor
!       # portion of the name.  We always set it to "unknown".
!       sysctl="sysctl -n hw.machine_arch"
!       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
!           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
!       case "${UNAME_MACHINE_ARCH}" in
!           armeb) machine=armeb-unknown ;;
!           arm*) machine=arm-unknown ;;
!           sh3el) machine=shl-unknown ;;
!           sh3eb) machine=sh-unknown ;;
!           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
!       esac
!       # The Operating System including object format, if it has switched
!       # to ELF recently, or will in the future.
!       case "${UNAME_MACHINE_ARCH}" in
!           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
!               eval $set_cc_for_build
!               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
!                       | grep __ELF__ >/dev/null
!               then
!                   # Once all utilities can be ECOFF (netbsdecoff) or a.out 
(netbsdaout).
!                   # Return netbsd for either.  FIX?
!                   os=netbsd
!               else
!                   os=netbsdelf
!               fi
!               ;;
!           *)
!               os=netbsd
!               ;;
        esac
        # The OS release
        release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
***************
*** 157,162 ****
--- 174,218 ----
        # 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}'`
***************
*** 190,195 ****
--- 246,252 ----
        jsr \$26,exit
        .end main
  EOF
+       eval $set_cc_for_build
        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
        if test "$?" = 0 ; then
                case `./$dummy` in
***************
*** 211,216 ****
--- 268,276 ----
                        2-307)
                                UNAME_MACHINE="alphaev67"
                                ;;
+                       2-1307)
+                               UNAME_MACHINE="alphaev68"
+                               ;;
                esac
        fi
        rm -f $dummy.s $dummy
***************
*** 228,256 ****
      Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
        exit 0;;
-     amiga:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
      *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
        exit 0 ;;
!     arc64:OpenBSD:*:*)
!       echo mips64el-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     arc:OpenBSD:*:*)
!       echo mipsel-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     hkmips:OpenBSD:*:*)
!       echo mips-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     pmax:OpenBSD:*:*)
!       echo mipsel-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     sgi:OpenBSD:*:*)
!       echo mips-unknown-openbsd${UNAME_RELEASE}
!       exit 0 ;;
!     wgrisc:OpenBSD:*:*)
!       echo mipsel-unknown-openbsd${UNAME_RELEASE}
        exit 0 ;;
      *:OS/390:*:*)
        echo i370-ibm-openedition
--- 288,298 ----
      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
***************
*** 258,264 ****
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
        exit 0;;
!     SR2?01:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
        exit 0;;
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
--- 300,306 ----
      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*:*:*)
***************
*** 300,306 ****
        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
      sun*:*:4.2BSD:*)
!       UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 
2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
        case "`/bin/arch`" in
            sun3)
--- 342,348 ----
        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
        case "`/bin/arch`" in
            sun3)
***************
*** 314,322 ****
      aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
        exit 0 ;;
-     atari*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${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
--- 356,361 ----
***************
*** 343,360 ****
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
          echo m68k-unknown-mint${UNAME_RELEASE}
          exit 0 ;;
-     sun3*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-     mac68k:OpenBSD:*:*)
-       echo m68k-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 ;;
      powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
        exit 0 ;;
--- 382,387 ----
***************
*** 371,376 ****
--- 398,404 ----
        echo clipper-intergraph-clix${UNAME_RELEASE}
        exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
  #ifdef __cplusplus
  #include <stdio.h>  /* for printf() prototype */
***************
*** 394,403 ****
  EOF
        $CC_FOR_BUILD $dummy.c -o $dummy \
          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
!         && rm $dummy.c $dummy && exit 0
        rm -f $dummy.c $dummy
        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;
--- 422,437 ----
  EOF
        $CC_FOR_BUILD $dummy.c -o $dummy \
          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
!         && rm -f $dummy.c $dummy && exit 0
        rm -f $dummy.c $dummy
        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
+     Motorola:PowerMAX_OS:*:*)
+       echo powerpc-motorola-powermax
+       exit 0 ;;
+     Night_Hawk:*:*:PowerMAX_OS)
+       echo powerpc-harris-powermax
+       exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;
***************
*** 445,455 ****
      ????????: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 ;;
      *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
                sed 's/^                //' << EOF >$dummy.c
                #include <sys/systemcfg.h>
  
--- 479,498 ----
      ????????: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`
+       else
+               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
                sed 's/^                //' << EOF >$dummy.c
                #include <sys/systemcfg.h>
  
***************
*** 461,467 ****
                        exit(0);
                        }
  EOF
!               $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c 
$dummy && exit 0
                rm -f $dummy.c $dummy
                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
--- 504,510 ----
                        exit(0);
                        }
  EOF
!               $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c 
$dummy && exit 0
                rm -f $dummy.c $dummy
                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
***************
*** 470,478 ****
                echo rs6000-ibm-aix3.2
        fi
        exit 0 ;;
!     *:AIX:*:4)
!       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | 
awk '{ print $1 }'`
!       if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; 
then
                IBM_ARCH=rs6000
        else
                IBM_ARCH=powerpc
--- 513,521 ----
                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
                IBM_ARCH=rs6000
        else
                IBM_ARCH=powerpc
***************
*** 480,486 ****
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
        else
!               IBM_REV=4.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
        exit 0 ;;
--- 523,529 ----
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
        else
!               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
        exit 0 ;;
***************
*** 506,516 ****
        echo m68k-hp-bsd4.4
        exit 0 ;;
      9000/[34678]??:HP-UX:*:*)
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
!               sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
                #include <stdlib.h>
--- 549,576 ----
        echo m68k-hp-bsd4.4
        exit 0 ;;
      9000/[34678]??:HP-UX:*:*)
+       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
!               if [ -x /usr/bin/getconf ]; then
!                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
!                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 
2>/dev/null`
!                     case "${sc_cpu_version}" in
!                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
!                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
!                       532)                      # CPU_PA_RISC2_0
!                         case "${sc_kernel_bits}" in
!                           32) HP_ARCH="hppa2.0n" ;;
!                           64) HP_ARCH="hppa2.0w" ;;
!                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
!                         esac ;;
!                     esac
!               fi
!               if [ "${HP_ARCH}" = "" ]; then
!                   eval $set_cc_for_build
!                   sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
                #include <stdlib.h>
***************
*** 543,556 ****
                    exit (0);
                }
  EOF
!       (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && 
HP_ARCH=`./$dummy`
!       if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
!       rm -f $dummy.c $dummy
        esac
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
        exit 0 ;;
      3050*:HI-UX:*:*)
        sed 's/^        //' << EOF >$dummy.c
        #include <unistd.h>
        int
--- 603,621 ----
                    exit (0);
                }
  EOF
!                   (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && 
HP_ARCH=`./$dummy`
!                   if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
!                   rm -f $dummy.c $dummy
!               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
        #include <unistd.h>
        int
***************
*** 576,582 ****
          exit (0);
        }
  EOF
!       $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && 
exit 0
        rm -f $dummy.c $dummy
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
--- 641,647 ----
          exit (0);
        }
  EOF
!       $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy 
&& exit 0
        rm -f $dummy.c $dummy
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
***************
*** 586,592 ****
      9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;
!     *9??*:MPE/iX:*:*)
        echo hppa1.0-hp-mpeix
        exit 0 ;;
      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
--- 651,657 ----
      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:*:* )
***************
*** 595,601 ****
      hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
        exit 0 ;;
!     i?86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
--- 660,666 ----
      hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
        exit 0 ;;
!     i*86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
***************
*** 605,613 ****
      parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
        exit 0 ;;
-     hppa*:OpenBSD:*:*)
-       echo hppa-unknown-openbsd
-       exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
          exit 0 ;;
--- 670,675 ----
***************
*** 626,666 ****
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
          exit 0 ;;
-     CRAY*X-MP:*:*:*)
-       echo xmp-cray-unicos
-         exit 0 ;;
      CRAY*Y-MP:*:*:*)
!       echo ymp-cray-unicos${UNAME_RELEASE}
        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/
        exit 0 ;;
      CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
!     CRAY*T3E:*:*:*)
        echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
      CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
!     CRAY-2:*:*:*)
!       echo cray2-cray-unicos
!         exit 0 ;;
!     F300:UNIX_System_V:*:*)
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
!         echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          exit 0 ;;
!     F301:UNIX_System_V:*:*)
!        echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
!        exit 0 ;;
!     hp300:OpenBSD:*:*)
!       echo m68k-unknown-openbsd${UNAME_RELEASE}
!       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:*:*)
--- 688,721 ----
      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:*:*)
***************
*** 672,680 ****
      *:FreeBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'`
        exit 0 ;;
-     *:OpenBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 
's/[-_].*/\./'`
-       exit 0 ;;
      i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit 0 ;;
--- 727,732 ----
***************
*** 684,689 ****
--- 736,744 ----
      i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit 0 ;;
+     x86:Interix*:3*)
+       echo i386-pc-interix3
+       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
***************
*** 705,946 ****
      i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
        exit 0 ;;
!     *: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
        # problems with other programs or directories called `ld' in the path.
!       ld_supported_emulations=`cd /; ld --help 2>&1 \
!                        | sed -ne '/supported emulations:/!d
                                    s/[         ][      ]*/ /g
!                                   s/.*supported emulations: *//
                                    s/ .*//
                                    p'`
!         case "$ld_supported_emulations" in
!         *ia64)
!               echo "${UNAME_MACHINE}-unknown-linux"
!               exit 0
!               ;;
!         i?86linux)
!               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
!               exit 0
!               ;;
!         elf_i?86)
                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                ;;
!         i?86coff)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
!               exit 0
!               ;;
!         sparclinux)
!               echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
!               exit 0
!               ;;
!         elf32_sparc)
!               echo "${UNAME_MACHINE}-unknown-linux-gnu"
!               exit 0
!               ;;
!         armlinux)
!               echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
!               exit 0
!               ;;
!         elf32arm*)
!               echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
!               exit 0
!               ;;
!         armelf_linux*)
!               echo "${UNAME_MACHINE}-unknown-linux-gnu"
!               exit 0
!               ;;
!         m68klinux)
!               echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
!               exit 0
!               ;;
!         elf32ppc | elf32ppclinux)
!               # Determine Lib Version
!               cat >$dummy.c <<EOF
! #include <features.h>
! #if defined(__GLIBC__)
! extern char __libc_version[];
! extern char __libc_release[];
! #endif
! main(argc, argv)
!      int argc;
!      char *argv[];
! {
! #if defined(__GLIBC__)
!   printf("%s %s\n", __libc_version, __libc_release);
! #else
!   printf("unkown\n");
! #endif
!   return 0;
! }
! EOF
!               LIBC=""
!               $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
!               if test "$?" = 0 ; then
!                       ./$dummy | grep 1\.99 > /dev/null
!                       if test "$?" = 0 ; then
!                               LIBC="libc1"
!                       fi
!               fi
!               rm -f $dummy.c $dummy
!               echo powerpc-unknown-linux-gnu${LIBC}
!               exit 0
!               ;;
!         shelf_linux)
!               echo "${UNAME_MACHINE}-unknown-linux-gnu"
!               exit 0
!               ;;
        esac
! 
!       if test "${UNAME_MACHINE}" = "alpha" ; then
!               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
!               LIBC=""
!               $CC_FOR_BUILD $dummy.s -o $dummy 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"
!                               ;;
!                       esac
! 
!                       objdump --private-headers $dummy | \
!                         grep ld.so.1 > /dev/null
!                       if test "$?" = 0 ; then
!                               LIBC="libc1"
!                       fi
!               fi
!               rm -f $dummy.s $dummy
!               echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
!       elif test "${UNAME_MACHINE}" = "mips" ; then
!         cat >$dummy.c <<EOF
! #ifdef __cplusplus
! #include <stdio.h>  /* for printf() prototype */
!       int main (int argc, char *argv[]) {
! #else
!       int main (argc, argv) int argc; char *argv[]; {
! #endif
! #ifdef __MIPSEB__
!   printf ("%s-unknown-linux-gnu\n", argv[1]);
! #endif
! #ifdef __MIPSEL__
!   printf ("%sel-unknown-linux-gnu\n", argv[1]);
! #endif
!   return 0;
! }
! EOF
!         $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy 
"${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
!         rm -f $dummy.c $dummy
!       elif test "${UNAME_MACHINE}" = "s390"; then
!         echo s390-ibm-linux && exit 0
!       elif test "${UNAME_MACHINE}" = "x86_64"; then
!         echo x86_64-unknown-linux-gnu && exit 0
!       elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; 
then
!         # Look for CPU level
!         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` 
in
!           PA7*)
!               echo hppa1.1-unknown-linux-gnu
!               ;;
!           PA8*)
!               echo hppa2.0-unknown-linux-gnu
!               ;;
!           *)
!               echo hppa-unknown-linux-gnu
!               ;;
!         esac
!         exit 0
!       else
!         # Either a pre-BFD a.out linker (linux-gnuoldld)
!         # or one that does not give us useful --help.
!         # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
!         # If ld does not provide *any* "supported emulations:"
!         # that means it is gnuoldld.
!         test -z "$ld_supported_emulations" \
!           && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
! 
!         case "${UNAME_MACHINE}" in
!         i?86)
!           VENDOR=pc;
!           ;;
!         *)
!           VENDOR=unknown;
!           ;;
!         esac
!         # Determine whether the default compiler is a.out or elf
!         cat >$dummy.c <<EOF
! #include <features.h>
! #ifdef __cplusplus
! #include <stdio.h>  /* for printf() prototype */
!       int main (int argc, char *argv[]) {
! #else
!       int main (argc, argv) int argc; char *argv[]; {
! #endif
! #ifdef __ELF__
! # ifdef __GLIBC__
! #  if __GLIBC__ >= 2
!     printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
! #  else
!     printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! #  endif
! # else
!    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
! # endif
! #else
!   printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
! #endif
!   return 0;
! }
  EOF
!         $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy 
"${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
!         rm -f $dummy.c $dummy
!         test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
!       fi ;;
! # 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.
!     i?86:DYNIX/ptx:4*:*)
        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...
          # I am not positive that other SVR4 systems won't match this,
--- 760,898 ----
      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
!       #undef CPU
!       #undef mips
!       #undef mipsel
!       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || 
defined(MIPSEL)
!       CPU=mipsel
!       #else
!       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || 
defined(MIPSEB)
!       CPU=mips
!       #else
!       CPU=
!       #endif
!       #endif
! EOF
!       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
!       rm -f $dummy.c
!       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 ;;
!         EV56)  UNAME_MACHINE=alphaev56 ;;
!         PCA56) UNAME_MACHINE=alphapca56 ;;
!         PCA57) UNAME_MACHINE=alphapca56 ;;
!         EV6)   UNAME_MACHINE=alphaev6 ;;
!         EV67)  UNAME_MACHINE=alphaev67 ;;
!         EV68*) UNAME_MACHINE=alphaev68 ;;
!         esac
!       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
!         PA7*) echo hppa1.1-unknown-linux-gnu ;;
!         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
        # problems with other programs or directories called `ld' in the path.
!       # Set LC_ALL=C to ensure ld outputs messages in English.
!       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
!                        | sed -ne '/supported targets:/!d
                                    s/[         ][      ]*/ /g
!                                   s/.*supported targets: *//
                                    s/ .*//
                                    p'`
!         case "$ld_supported_targets" in
!         elf32-i386)
                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                ;;
!         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
!       sed 's/^        //' << EOF >$dummy.c
!       #include <features.h>
!       #ifdef __ELF__
!       # ifdef __GLIBC__
!       #  if __GLIBC__ >= 2
!       LIBC=gnu
!       #  else
!       LIBC=gnulibc1
!       #  endif
!       # else
!       LIBC=gnulibc1
!       # endif
!       #else
!       #ifdef __INTEL_COMPILER
!       LIBC=gnu
!       #else
!       LIBC=gnuaout
!       #endif
!       #endif
  EOF
!       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
!       rm -f $dummy.c
!       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...
          # I am not positive that other SVR4 systems won't match this,
***************
*** 948,954 ****
          # 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
                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
--- 900,906 ----
          # 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
                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
***************
*** 956,971 ****
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
        fi
        exit 0 ;;
!     i?86:*:5:7*)
!         # Fixed at (any) Pentium or better
!         UNAME_MACHINE=i586
!         if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
!           echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
!       else
!           echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
!       fi
        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`
                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
--- 908,922 ----
                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`
                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
***************
*** 983,989 ****
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
        exit 0 ;;
!     i?86:*DOS:*:*)
        echo ${UNAME_MACHINE}-pc-msdosdjgpp
        exit 0 ;;
      pc:*:*:*)
--- 934,940 ----
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
        exit 0 ;;
!     i*86:*DOS:*:*)
        echo ${UNAME_MACHINE}-pc-msdosdjgpp
        exit 0 ;;
      pc:*:*:*)
***************
*** 1011,1017 ****
        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 | 
4850:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
--- 962,968 ----
        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`
***************
*** 1022,1042 ****
      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.*:*)
        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]*:*)
        echo i386-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
      TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
!     rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
        echo rs6000-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
      SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
        exit 0 ;;
--- 973,996 ----
      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 ;;
***************
*** 1054,1061 ****
                echo ns32k-sni-sysv
        fi
        exit 0 ;;
!     PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
!                            # says <address@hidden>
          echo i586-unisys-sysv4
          exit 0 ;;
      *:UNIX_System_V:4*:FTX*)
--- 1008,1015 ----
                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*)
***************
*** 1067,1072 ****
--- 1021,1030 ----
        # 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 ;;
***************
*** 1105,1119 ****
        echo `uname -p`-apple-darwin${UNAME_RELEASE}
        exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
!       if test "${UNAME_MACHINE}" = "x86pc"; then
                UNAME_MACHINE=pc
        fi
!       echo `uname -p`-${UNAME_MACHINE}-nto-qnx
        exit 0 ;;
      *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;
!     NSR-[KW]:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
      *:NonStop-UX:*:*)
--- 1063,1079 ----
        echo `uname -p`-apple-darwin${UNAME_RELEASE}
        exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
!       UNAME_PROCESSOR=`uname -p`
!       if test "$UNAME_PROCESSOR" = "x86"; then
!               UNAME_PROCESSOR=i386
                UNAME_MACHINE=pc
        fi
!       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
        exit 0 ;;
      *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;
!     NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
      *:NonStop-UX:*:*)
***************
*** 1136,1146 ****
--- 1096,1136 ----
        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
  #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 
1>&2
  
+ eval $set_cc_for_build
  cat >$dummy.c <<EOF
  #ifdef _SEQUENT_
  # include <sys/types.h>
***************
*** 1227,1237 ****
  #endif
  
  #if defined (vax)
! #if !defined (ultrix)
!   printf ("vax-dec-bsd\n"); exit (0);
! #else
!   printf ("vax-dec-ultrix\n"); exit (0);
! #endif
  #endif
  
  #if defined (alliant) && defined (i860)
--- 1217,1240 ----
  #endif
  
  #if defined (vax)
! # if !defined (ultrix)
! #  include <sys/param.h>
! #  if defined (BSD)
! #   if BSD == 43
!       printf ("vax-dec-bsd4.3\n"); exit (0);
! #   else
! #    if BSD == 199006
!       printf ("vax-dec-bsd4.3reno\n"); exit (0);
! #    else
!       printf ("vax-dec-bsd\n"); exit (0);
! #    endif
! #   endif
! #  else
!     printf ("vax-dec-bsd\n"); exit (0);
! #  endif
! # else
!     printf ("vax-dec-ultrix\n"); exit (0);
! # endif
  #endif
  
  #if defined (alliant) && defined (i860)
***************
*** 1242,1248 ****
  }
  EOF
  
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c 
$dummy && exit 0
  rm -f $dummy.c $dummy
  
  # Apollos put the system type in the environment.
--- 1245,1251 ----
  }
  EOF
  
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c 
$dummy && exit 0
  rm -f $dummy.c $dummy
  
  # Apollos put the system type in the environment.
***************
*** 1278,1285 ****
  cat >&2 <<EOF
  $0: unable to guess system type
  
! The $version version of this script cannot recognize your system type.
! Please download the most up to date version of the config scripts:
  
      ftp://ftp.gnu.org/pub/gnu/config/
  
--- 1281,1289 ----
  cat >&2 <<EOF
  $0: unable to guess system type
  
! This script, last modified $timestamp, has failed to recognize
! 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/
  
***************
*** 1288,1294 ****
  pertinent to <address@hidden> in order to provide the needed
  information to handle your system.
  
! config.guess version = $version
  
  uname -m = `(uname -m) 2>/dev/null || echo unknown`
  uname -r = `(uname -r) 2>/dev/null || echo unknown`
--- 1292,1298 ----
  pertinent to <address@hidden> in order to provide the needed
  information to handle your system.
  
! config.guess timestamp = $timestamp
  
  uname -m = `(uname -m) 2>/dev/null || echo unknown`
  uname -r = `(uname -r) 2>/dev/null || echo unknown`
***************
*** 1315,1321 ****
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "version='"
  # time-stamp-format: "%:y-%02m-%02d"
  # time-stamp-end: "'"
  # End:
--- 1319,1325 ----
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
! # time-stamp-start: "timestamp='"
  # time-stamp-format: "%:y-%02m-%02d"
  # time-stamp-end: "'"
  # End:



reply via email to

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