gnats-diffs
[Top][All Lists]
Advanced

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

Changes to gnats/config.guess


From: Milan Zamazal
Subject: Changes to gnats/config.guess
Date: Mon, 13 Jan 2003 08:19:04 -0500

Index: gnats/config.guess
diff -c gnats/config.guess:1.4 gnats/config.guess:1.5
*** gnats/config.guess:1.4      Wed Aug 29 16:25:49 2001
--- gnats/config.guess  Mon Jan 13 08:19:04 2003
***************
*** 1,9 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! #   Free Software Foundation, Inc.
  
! timestamp='2001-08-09'
  
  # 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-09-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
***************
*** 24,31 ****
  # 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
--- 24,32 ----
  # 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
***************
*** 87,116 ****
    exit 1
  fi
  
  
! 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 ; 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)
--- 88,127 ----
    exit 1
  fi
  
+ trap 'exit 1' 1 2 15
  
! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
! # compiler to aid in system detection is discouraged as it requires
! # temporary files to be created and, as you can see below, it is a
! # headache to deal with in a portable fashion.
  
  # 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
!         if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
             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)
***************
*** 127,155 ****
  
  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 it has switched
        # to ELF recently, or will in the future.
!       case "${UNAME_MACHINE}" in
!           
i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                        | grep __ELF__ >/dev/null
--- 138,167 ----
  
  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
***************
*** 172,177 ****
--- 184,228 ----
        # 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}'`
***************
*** 180,185 ****
--- 231,237 ----
        # 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:
***************
*** 205,214 ****
        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
                        0-0)
                                UNAME_MACHINE="alpha"
                                ;;
--- 257,265 ----
        jsr \$26,exit
        .end main
  EOF
        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
        if test "$?" = 0 ; then
!               case `$dummy` in
                        0-0)
                                UNAME_MACHINE="alpha"
                                ;;
***************
*** 230,238 ****
                        2-1307)
                                UNAME_MACHINE="alphaev68"
                                ;;
                esac
        fi
!       rm -f $dummy.s $dummy
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 
's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        exit 0 ;;
      Alpha\ *:Windows_NT*:*)
--- 281,292 ----
                        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*:*)
***************
*** 247,275 ****
      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
--- 301,311 ----
      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
***************
*** 291,296 ****
--- 327,336 ----
      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 ;;
***************
*** 319,325 ****
        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)
--- 359,365 ----
        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)
***************
*** 333,341 ****
      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
--- 373,378 ----
***************
*** 362,379 ****
      *:*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 ;;
--- 399,404 ----
***************
*** 390,395 ****
--- 415,421 ----
        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 */
***************
*** 411,426 ****
          exit (-1);
        }
  EOF
-       eval $set_cc_for_build
        $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:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;
--- 437,457 ----
          exit (-1);
        }
  EOF
        $CC_FOR_BUILD $dummy.c -o $dummy \
!         && $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)
+       echo powerpc-harris-powermax
+       exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;
***************
*** 481,486 ****
--- 512,518 ----
        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>
  
***************
*** 492,500 ****
                        exit(0);
                        }
  EOF
!               eval $set_cc_for_build
!               $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
                echo rs6000-ibm-aix3.2.4
--- 524,531 ----
                        exit(0);
                        }
  EOF
!               $CC_FOR_BUILD $dummy.c -o $dummy && $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
***************
*** 503,509 ****
        fi
        exit 0 ;;
      *:AIX:*:[45])
!       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | 
awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; 
then
                IBM_ARCH=rs6000
        else
--- 534,540 ----
        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
***************
*** 543,552 ****
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
!               case "${HPUX_REV}" in
!                 11.[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
--- 574,581 ----
            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
***************
*** 555,566 ****
                          case "${sc_kernel_bits}" in
                            32) HP_ARCH="hppa2.0n" ;;
                            64) HP_ARCH="hppa2.0w" ;;
                          esac ;;
                      esac
!                   fi ;;
!               esac
!               if [ "${HP_ARCH}" = "" ]; then
!               sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
                #include <stdlib.h>
--- 584,596 ----
                          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>
***************
*** 593,603 ****
                    exit (0);
                }
  EOF
!       eval $set_cc_for_build
!       (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 ;;
--- 623,632 ----
                    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 && rmdir $tmpdir
!               fi ;;
        esac
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
        exit 0 ;;
***************
*** 606,611 ****
--- 635,641 ----
        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
***************
*** 631,639 ****
          exit (0);
        }
  EOF
!       eval $set_cc_for_build
!       $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 ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
--- 661,668 ----
          exit (0);
        }
  EOF
!       $CC_FOR_BUILD $dummy.c -o $dummy && $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:*:* )
***************
*** 661,669 ****
      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 ;;
--- 690,695 ----
***************
*** 682,690 ****
      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} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
--- 708,713 ----
***************
*** 706,723 ****
      CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
-     CRAY-2:*:*:*)
-       echo cray2-cray-unicos
-         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 ;;
-     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 ;;
--- 729,740 ----
***************
*** 728,737 ****
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
        exit 0 ;;
      *: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
--- 745,763 ----
        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
***************
*** 742,747 ****
--- 768,776 ----
      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
***************
*** 767,782 ****
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
      ia64:Linux:*:*)
!       echo ${UNAME_MACHINE}-unknown-linux
        exit 0 ;;
      m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
      mips:Linux:*:*)
!       case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
!         big)    echo mips-unknown-linux-gnu && exit 0 ;;
!         little) echo mipsel-unknown-linux-gnu && exit 0 ;;
!       esac
        ;;
      ppc:Linux:*:*)
        echo powerpc-unknown-linux-gnu
--- 796,825 ----
        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 && rmdir $tmpdir
!       test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
        ;;
      ppc:Linux:*:*)
        echo powerpc-unknown-linux-gnu
***************
*** 825,831 ****
        # 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_targets=`cd /; ld --help 2>&1 \
                         | sed -ne '/supported targets:/!d
                                    s/[         ][      ]*/ /g
                                    s/.*supported targets: *//
--- 868,875 ----
        # 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: *//
***************
*** 837,843 ****
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
!               exit 0 ;;               
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                exit 0 ;;
--- 881,887 ----
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
!               exit 0 ;;
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                exit 0 ;;
***************
*** 848,880 ****
                exit 0 ;;
        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-pc-linux-gnu\n", argv[1]);
- #  else
-     printf ("%s-pc-linux-gnulibc1\n", argv[1]);
- #  endif
- # else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
- # endif
- #else
-   printf ("%s-pc-linux-gnuaout\n", argv[1]);
- #endif
-   return 0;
- }
- EOF
        eval $set_cc_for_build
!       $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy 
"${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
!       rm -f $dummy.c $dummy
        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
        ;;
      i*86:DYNIX/ptx:4*:*)
--- 892,921 ----
                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 && 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*:*)
***************
*** 912,924 ****
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
        elif /bin/uname -X 2>/dev/null >/dev/null ; then
!               UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
!               (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
!               (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
                        && UNAME_MACHINE=i586
!               (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
                        && UNAME_MACHINE=i686
!               (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
                        && UNAME_MACHINE=i686
                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
        else
--- 953,965 ----
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
        elif /bin/uname -X 2>/dev/null >/dev/null ; then
!               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
!               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
!               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
                        && UNAME_MACHINE=i586
!               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
                        && UNAME_MACHINE=i686
!               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                        && UNAME_MACHINE=i686
                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
        else
***************
*** 951,959 ****
        # "miniframe"
        echo m68010-convergent-sysv
        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`
--- 992,1003 ----
        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;
+     mc68k:UNIX:SYSTEM5:3.51m)
+       echo m68k-convergent-sysv
+       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`
***************
*** 1044,1049 ****
--- 1088,1096 ----
      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 ;;
***************
*** 1054,1068 ****
        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:*:*)
--- 1101,1117 ----
        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-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
      *:NonStop-UX:*:*)
***************
*** 1111,1121 ****
--- 1160,1174 ----
      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>
***************
*** 1230,1238 ****
  }
  EOF
  
! eval $set_cc_for_build
! $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.
  
--- 1283,1290 ----
  }
  EOF
  
! $CC_FOR_BUILD $dummy.c -o $dummy 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.
  




reply via email to

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