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

[Paul Eggert]

Index: emacs/config.guess
diff -c emacs/config.guess:1.123 emacs/config.guess:1.124
*** emacs/config.guess:1.123    Sun Mar 12 10:18:26 2000
--- emacs/config.guess  Sat Nov 11 10:57:44 2000
***************
*** 2,8 ****
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  #   Free Software Foundation, Inc.
! #
  # 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
  # the Free Software Foundation; either version 2 of the License, or
--- 2,10 ----
  # 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
  # the Free Software Foundation; either version 2 of the License, or
***************
*** 36,41 ****
--- 38,87 ----
  # (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 ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )       # Use stdin as input.
+        break ;;
+     -* )
+        exec >&2
+        echo "$me: invalid option $1"
+        echo "$help"
+        exit 1 ;;
+     * )
+        break ;;
+   esac
+ done
+ 
+ if test $# != 0; then
+   echo "$me: too many arguments$help" >&2
+   exit 1
+ fi
+ 
+ 
+ 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
***************
*** 44,50 ****
      if test x"$CC" != x; then
        CC_FOR_BUILD="$CC"
      else
!       CC_FOR_BUILD=cc
      fi
    fi
  fi
--- 90,106 ----
      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
***************
*** 61,69 ****
  UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
- dummy=dummy-$$
- trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
- 
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
--- 117,122 ----
***************
*** 77,83 ****
        # object file format.
        # Determine the machine/vendor (is the vendor relevant).
        case "${UNAME_MACHINE}" in
!           amiga) machine=m68k-cbm ;;
            arm32) machine=arm-unknown ;;
            atari*) machine=m68k-atari ;;
            sun3*) machine=m68k-sun ;;
--- 130,136 ----
        # 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 ;;
***************
*** 173,179 ****
        echo alpha-dec-winnt3.5
        exit 0 ;;
      Amiga*:UNIX_System_V:4.0:*)
!       echo m68k-cbm-sysv4
        exit 0;;
      amiga:OpenBSD:*:*)
        echo m68k-unknown-openbsd${UNAME_RELEASE}
--- 226,232 ----
        echo alpha-dec-winnt3.5
        exit 0 ;;
      Amiga*:UNIX_System_V:4.0:*)
!       echo m68k-unknown-sysv4
        exit 0;;
      amiga:OpenBSD:*:*)
        echo m68k-unknown-openbsd${UNAME_RELEASE}
***************
*** 266,272 ****
        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 
      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
      # to the lowercase version "mint" (or "freemint").  Finally
      # the system name "TOS" denotes a system which is actually not
--- 319,325 ----
        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
      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
      # to the lowercase version "mint" (or "freemint").  Finally
      # the system name "TOS" denotes a system which is actually not
***************
*** 360,366 ****
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
!       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
        then
            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
               [ ${TARGET_BINARY_INTERFACE}x = x ]
--- 413,419 ----
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
!       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
        then
            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
               [ ${TARGET_BINARY_INTERFACE}x = x ]
***************
*** 458,463 ****
--- 511,518 ----
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
                sed 's/^              //' << EOF >$dummy.c
+ 
+               #define _HPUX_SOURCE
                #include <stdlib.h>
                #include <unistd.h>
  
***************
*** 489,494 ****
--- 544,550 ----
                }
  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]*//'`
***************
*** 588,594 ****
        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
--- 644,650 ----
        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
***************
*** 604,610 ****
      hp300:OpenBSD:*:*)
        echo m68k-unknown-openbsd${UNAME_RELEASE}
        exit 0 ;;
!     i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
        exit 0 ;;
      sparc*:BSD/OS:*:*)
--- 660,666 ----
      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:*:*)
***************
*** 614,625 ****
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
        exit 0 ;;
      *:FreeBSD:*:*)
-       if test -x /usr/bin/objformat; then
-           if test "elf" = "`/usr/bin/objformat`"; then
-               echo ${UNAME_MACHINE}-unknown-freebsdelf`echo 
${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-               exit 0
-           fi
-       fi
        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'`
        exit 0 ;;
      *:OpenBSD:*:*)
--- 670,675 ----
***************
*** 631,636 ****
--- 681,689 ----
      i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit 0 ;;
+     i*:PW*:*)
+       echo ${UNAME_MACHINE}-pc-pw32
+       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
***************
*** 649,661 ****
      *:GNU:*:*)
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo 
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        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_help_string=`cd /; ld --help 2>&1`
!       ld_supported_emulations=`echo $ld_help_string \
                         | sed -ne '/supported emulations:/!d
                                    s/[         ][      ]*/ /g
                                    s/.*supported emulations: *//
--- 702,716 ----
      *: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 ;;
      *: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: *//
***************
*** 670,675 ****
--- 725,733 ----
                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
***************
*** 678,683 ****
--- 736,745 ----
                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
***************
*** 721,731 ****
                        if test "$?" = 0 ; then
                                LIBC="libc1"
                        fi
!               fi      
                rm -f $dummy.c $dummy
                echo powerpc-unknown-linux-gnu${LIBC}
                exit 0
                ;;
        esac
  
        if test "${UNAME_MACHINE}" = "alpha" ; then
--- 783,797 ----
                        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
***************
*** 807,820 ****
          rm -f $dummy.c $dummy
        elif test "${UNAME_MACHINE}" = "s390"; then
          echo s390-ibm-linux && 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.
!         echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
!         test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
  
          case "${UNAME_MACHINE}" in
          i?86)
--- 873,902 ----
          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)
***************
*** 851,856 ****
--- 933,939 ----
  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.
***************
*** 928,934 ****
        exit 0 ;;
      M68*:*:R3V[567]*:*)
        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
!     3[34]??:*: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`
--- 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`
***************
*** 987,993 ****
      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:*:*)
--- 1070,1076 ----
      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:*:*)
***************
*** 1018,1031 ****
      *:Rhapsody:*:*)
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
!     Power*:Mac*OS:*:*)
!       echo powerpc-apple-macos${UNAME_RELEASE}
        exit 0 ;;
!     *:Mac*OS:*:*)
!       echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE}
        exit 0 ;;
      *:QNX:*:4*)
!       echo i386-qnx-qnx${UNAME_VERSION}
        exit 0 ;;
  esac
  
--- 1101,1140 ----
      *:Rhapsody:*:*)
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
!     *:Darwin:*:*)
!       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:*:*)
!       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
!       # operating systems.
!       if test "$cputype" = "386"; then
!           UNAME_MACHINE=i386
!       else
!           UNAME_MACHINE="$cputype"
!       fi
!       echo ${UNAME_MACHINE}-unknown-plan9
        exit 0 ;;
  esac
  
***************
*** 1166,1171 ****
      esac
  fi
  
! #echo '(Unable to guess system type)' 1>&2
  
  exit 1
--- 1275,1321 ----
      esac
  fi
  
! 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/
! 
! If the version you run ($0) is already up to date, please
! send the following data and any information you think might be
! 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`
! uname -s = `(uname -s) 2>/dev/null || echo unknown`
! uname -v = `(uname -v) 2>/dev/null || echo unknown`
! 
! /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
! /bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
! 
! hostinfo               = `(hostinfo) 2>/dev/null`
! /bin/universe          = `(/bin/universe) 2>/dev/null`
! /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
! /bin/arch              = `(/bin/arch) 2>/dev/null`
! /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
! /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
! 
! UNAME_MACHINE = ${UNAME_MACHINE}
! UNAME_RELEASE = ${UNAME_RELEASE}
! UNAME_SYSTEM  = ${UNAME_SYSTEM}
! UNAME_VERSION = ${UNAME_VERSION}
! EOF
  
  exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "version='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End: