IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 22, 2005, 4:07:27 PM (21 years ago)
Author:
desonia
Message:

fixed problem that broke Linux.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/config.guess

    r3764 r3765  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    5 
    6 timestamp='2003-02-22'
     4#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
     5
     6timestamp='2004-08-11'
    77
    88# This file is free software; you can redistribute it and/or modify it
    … …  
    5454
    5555Originally written by Per Bothner.
    56 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     56Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    5757Free Software Foundation, Inc.
    5858
    … …  
    107107 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    108108 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
     109 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
    109110 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
    110111dummy=$tmp/dummy ;
    … …  
    135136UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
    136137UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
     138
     139case "${UNAME_MACHINE}" in
     140    i?86)
     141        test -z "$VENDOR" && VENDOR=pc
     142        ;;
     143    *)
     144        test -z "$VENDOR" && VENDOR=unknown
     145        ;;
     146esac
     147test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
    137148
    138149# Note: order is significant - the case branches are not exclusive.
    … …  
    197208        echo "${machine}-${os}${release}"
    198209        exit 0 ;;
     210    amd64:OpenBSD:*:*)
     211        echo x86_64-unknown-openbsd${UNAME_RELEASE}
     212        exit 0 ;;
    199213    amiga:OpenBSD:*:*)
    200214        echo m68k-unknown-openbsd${UNAME_RELEASE}
    … …  
    203217        echo mipsel-unknown-openbsd${UNAME_RELEASE}
    204218        exit 0 ;;
     219    cats:OpenBSD:*:*)
     220        echo arm-unknown-openbsd${UNAME_RELEASE}
     221        exit 0 ;;
    205222    hp300:OpenBSD:*:*)
    206223        echo m68k-unknown-openbsd${UNAME_RELEASE}
    207224        exit 0 ;;
     225    luna88k:OpenBSD:*:*)
     226        echo m88k-unknown-openbsd${UNAME_RELEASE}
     227        exit 0 ;;
    208228    mac68k:OpenBSD:*:*)
    209229        echo m68k-unknown-openbsd${UNAME_RELEASE}
    … …  
    236256        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    237257        exit 0 ;;
     258    *:ekkoBSD:*:*)
     259        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
     260        exit 0 ;;
     261    macppc:MirBSD:*:*)
     262        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
     263        exit 0 ;;
     264    *:MirBSD:*:*)
     265        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
     266        exit 0 ;;
    238267    alpha:OSF1:*:*)
    239         if test $UNAME_RELEASE = "V4.0"; then
     268        case $UNAME_RELEASE in
     269        *4.0)
    240270                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
    241         fi
     271                ;;
     272        *5.*)
     273                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
     274                ;;
     275        esac
    242276        # According to Compaq, /usr/sbin/psrinfo has been available on
    243277        # OSF/1 and Tru64 systems produced since 1995.  I hope that
    … …  
    277311                UNAME_MACHINE="alphaev79" ;;
    278312        esac
     313        # A Pn.n version is a patched version.
    279314        # A Vn.n version is a released version.
    280315        # A Tn.n version is a released field test version.
    281316        # A Xn.n version is an unreleased experimental baselevel.
    282317        # 1.2 uses "1.2" for uname -r.
    283         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     318        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    284319        exit 0 ;;
    285320    Alpha\ *:Windows_NT*:*)
    … …  
    303338    *:OS/390:*:*)
    304339        echo i370-ibm-openedition
     340        exit 0 ;;
     341    *:OS400:*:*)
     342        echo powerpc-ibm-os400
    305343        exit 0 ;;
    306344    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    … …  
    321359        echo pyramid-pyramid-svr4
    322360        exit 0 ;;
     361    DRS?6000:unix:4.0:6*)
     362        echo sparc-icl-nx6
     363        exit 0 ;;
    323364    DRS?6000:UNIX_SV:4.2*:7*)
    324365        case `/usr/bin/uname -p` in
    … …  
    393434        echo m68k-unknown-mint${UNAME_RELEASE}
    394435        exit 0 ;;
     436    m68k:machten:*:*)
     437        echo m68k-apple-machten${UNAME_RELEASE}
     438        exit 0 ;;
    395439    powerpc:machten:*:*)
    396440        echo powerpc-apple-machten${UNAME_RELEASE}
    … …  
    728772        exit 0 ;;
    729773    *:UNICOS/mp:*:*)
    730         echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
     774        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    731775        exit 0 ;;
    732776    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    … …  
    736780        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    737781        exit 0 ;;
     782    5000:UNIX_System_V:4.*:*)
     783        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     784        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
     785        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     786        exit 0 ;;
    738787    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
    739788        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
    … …  
    746795        exit 0 ;;
    747796    *:FreeBSD:*:*)
    748         # Determine whether the default compiler uses glibc.
    749         eval $set_cc_for_build
    750         sed 's/^        //' << EOF >$dummy.c
    751         #include <features.h>
    752         #if __GLIBC__ >= 2
    753         LIBC=gnu
    754         #else
    755         LIBC=
    756         #endif
    757 EOF
    758         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    759         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
     797        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    760798        exit 0 ;;
    761799    i*:CYGWIN*:*)
    … …  
    768806        echo ${UNAME_MACHINE}-pc-pw32
    769807        exit 0 ;;
    770     x86:Interix*:3*)
    771         echo i586-pc-interix3
     808    x86:Interix*:[34]*)
     809        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
    772810        exit 0 ;;
    773811    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    … …  
    790828        exit 0 ;;
    791829    *:GNU:*:*)
     830        # the GNU system
    792831        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
     832        exit 0 ;;
     833    *:GNU/*:*:*)
     834        # other systems with GNU libc and userland
     835        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
    793836        exit 0 ;;
    794837    i*86:Minix:*:*)
    … …  
    796839        exit 0 ;;
    797840    arm*:Linux:*:*)
    798         echo ${UNAME_MACHINE}-unknown-linux-gnu
     841        echo ${UNAME_MACHINE}-${VENDOR}-linux
     842        exit 0 ;;
     843    cris:Linux:*:*)
     844        echo cris-axis-linux
    799845        exit 0 ;;
    800846    ia64:Linux:*:*)
    801         echo ${UNAME_MACHINE}-unknown-linux-gnu
     847        echo ${UNAME_MACHINE}-${VENDOR}-linux
     848        exit 0 ;;
     849    m32r*:Linux:*:*)
     850        echo ${UNAME_MACHINE}-${VENDOR}-linux
    802851        exit 0 ;;
    803852    m68*:Linux:*:*)
    804         echo ${UNAME_MACHINE}-unknown-linux-gnu
     853        echo ${UNAME_MACHINE}-${VENDOR}-linux
    805854        exit 0 ;;
    806855    mips:Linux:*:*)
    … …  
    821870EOF
    822871        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    823         test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
     872        test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
    824873        ;;
    825874    mips64:Linux:*:*)
    … …  
    840889EOF
    841890        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    842         test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
     891        test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
    843892        ;;
    844893    ppc:Linux:*:*)
    845         echo powerpc-unknown-linux-gnu
     894        echo powerpc-${VENDOR}-linux
    846895        exit 0 ;;
    847896    ppc64:Linux:*:*)
    848         echo powerpc64-unknown-linux-gnu
     897        echo powerpc64-${VENDOR}-linux
    849898        exit 0 ;;
    850899    alpha:Linux:*:*)
    … …  
    859908        esac
    860909        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
    861         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
    862         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     910        if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
     911        echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
    863912        exit 0 ;;
    864913    parisc:Linux:*:* | hppa:Linux:*:*)
    865914        # Look for CPU level
    866915        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
    867           PA7*) echo hppa1.1-unknown-linux-gnu ;;
    868           PA8*) echo hppa2.0-unknown-linux-gnu ;;
    869           *)    echo hppa-unknown-linux-gnu ;;
     916          PA7*) echo hppa1.1-${VENDOR}-linux ;;
     917          PA8*) echo hppa2.0-${VENDOR}-linux ;;
     918          *)    echo hppa-${VENDOR}-linux ;;
    870919        esac
    871920        exit 0 ;;
    872921    parisc64:Linux:*:* | hppa64:Linux:*:*)
    873         echo hppa64-unknown-linux-gnu
     922        echo hppa64-${VENDOR}-linux
    874923        exit 0 ;;
    875924    s390:Linux:*:* | s390x:Linux:*:*)
    876925        echo ${UNAME_MACHINE}-ibm-linux
    877926        exit 0 ;;
     927    sh64*:Linux:*:*)
     928        echo ${UNAME_MACHINE}-${VENDOR}-linux
     929        exit 0 ;;
    878930    sh*:Linux:*:*)
    879         echo ${UNAME_MACHINE}-unknown-linux-gnu
     931        echo ${UNAME_MACHINE}-${VENDOR}-linux
    880932        exit 0 ;;
    881933    sparc:Linux:*:* | sparc64:Linux:*:*)
    882         echo ${UNAME_MACHINE}-unknown-linux-gnu
     934        echo ${UNAME_MACHINE}-${VENDOR}-linux
    883935        exit 0 ;;
    884936    x86_64:Linux:*:*)
    885         echo x86_64-unknown-linux-gnu
     937        echo x86_64-${VENDOR}-linux
    886938        exit 0 ;;
    887939    i*86:Linux:*:*)
    … …  
    898950        case "$ld_supported_targets" in
    899951          elf32-i386)
    900                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
     952                TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
    901953                ;;
    902954          a.out-i386-linux)
    903                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
     955                echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
    904956                exit 0 ;;
    905957          coff-i386)
    906                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
     958                echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
    907959                exit 0 ;;
    908960          "")
    909                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
     961                # Either a pre-BFD a.out linker (linuxoldld) or
    910962                # one that does not give us useful --help.
    911                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
     963                echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
    912964                exit 0 ;;
    913965        esac
    … …  
    933985        #endif
    934986        #endif
     987        #ifdef __dietlibc__
     988        LIBC=dietlibc
     989        #endif
    935990EOF
    936991        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    937         test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
     992        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
    938993        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
    939994        ;;
    … …  
    9621017    i*86:atheos:*:*)
    9631018        echo ${UNAME_MACHINE}-unknown-atheos
     1019        exit 0 ;;
     1020        i*86:syllable:*:*)
     1021        echo ${UNAME_MACHINE}-pc-syllable
    9641022        exit 0 ;;
    9651023    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
    … …  
    10321090        echo m68k-diab-dnix
    10331091        exit 0 ;;
    1034     M68*:*:R3V[567]*:*)
     1092    M68*:*:R3V[5678]*:*)
    10351093        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
    1036     3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
     1094    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
    10371095        OS_REL=''
    10381096        test -r /etc/.relid \
    … …  
    11321190        exit 0 ;;
    11331191    *:Darwin:*:*)
    1134         case `uname -p` in
     1192        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
     1193        case $UNAME_PROCESSOR in
    11351194            *86) UNAME_PROCESSOR=i686 ;;
    1136             powerpc) UNAME_PROCESSOR=powerpc ;;
     1195            unknown) UNAME_PROCESSOR=powerpc ;;
    11371196        esac
    11381197        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    … …  
    11491208        echo i386-pc-qnx
    11501209        exit 0 ;;
    1151     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
     1210    NSR-?:NONSTOP_KERNEL:*:*)
    11521211        echo nsr-tandem-nsk${UNAME_RELEASE}
    11531212        exit 0 ;;
    … …  
    11901249        echo pdp10-unknown-its
    11911250        exit 0 ;;
     1251    SEI:*:*:SEIUX)
     1252        echo mips-sei-seiux${UNAME_RELEASE}
     1253        exit 0 ;;
     1254    *:DragonFly:*:*)
     1255        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     1256        exit 0 ;;
     1257    *:*VMS:*:*)
     1258        UNAME_MACHINE=`(uname -p) 2>/dev/null`
     1259        case "${UNAME_MACHINE}" in
     1260            A*) echo alpha-dec-vms && exit 0 ;;
     1261            I*) echo ia64-dec-vms && exit 0 ;;
     1262            V*) echo vax-dec-vms && exit 0 ;;
     1263        esac
    11921264esac
    11931265
Note: See TracChangeset for help on using the changeset viewer.