Changeset e03f404 in mod_gnutls for config/config.guess


Ignore:
Timestamp:
Jan 11, 2013, 12:57:52 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
ae015fa
Parents:
4e539d3 (diff), 66b608e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.5.6'

Upstream version 0.5.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • config/config.guess

    r4e539d3 re03f404  
    55#   Free Software Foundation, Inc.
    66
    7 timestamp='2008-01-23'
     7timestamp='2009-04-27'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    325325            sparc) echo sparc-icl-nx7; exit ;;
    326326        esac ;;
     327    s390x:SunOS:*:*)
     328        echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     329        exit ;;
    327330    sun4H:SunOS:5.*:*)
    328331        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     
    332335        exit ;;
    333336    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
    334         echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     337        eval $set_cc_for_build
     338        SUN_ARCH="i386"
     339        # If there is a compiler, see if it is configured for 64-bit objects.
     340        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
     341        # This test works for both compilers.
     342        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     343            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
     344                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     345                grep IS_64BIT_ARCH >/dev/null
     346            then
     347                SUN_ARCH="x86_64"
     348            fi
     349        fi
     350        echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    335351        exit ;;
    336352    sun4*:SunOS:6*:*)
     
    797813                echo i586-pc-interix${UNAME_RELEASE}
    798814                exit ;;
    799             EM64T | authenticamd)
     815            EM64T | authenticamd | genuineintel)
    800816                echo x86_64-unknown-interix${UNAME_RELEASE}
    801817                exit ;;
     
    936952        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
    937953        exit ;;
     954    padre:Linux:*:*)
     955        echo sparc-unknown-linux-gnu
     956        exit ;;
    938957    parisc:Linux:*:* | hppa:Linux:*:*)
    939958        # Look for CPU level
     
    9851004          a.out-i386-linux)
    9861005                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
    987                 exit ;;
    988           coff-i386)
    989                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
    9901006                exit ;;
    9911007          "")
     
    11031119        # Left here for compatibility:
    11041120        # uname -m prints for DJGPP always 'pc', but it prints nothing about
    1105         # the processor, so we play safe by assuming i386.
    1106         echo i386-pc-msdosdjgpp
     1121        # the processor, so we play safe by assuming i586.
     1122        # Note: whatever this is, it MUST be the same as what config.sub
     1123        # prints for the "djgpp" host, or else GDB configury will decide that
     1124        # this is a cross-build.
     1125        echo i586-pc-msdosdjgpp
    11071126        exit ;;
    11081127    Intel:Mach:3*:*)
     
    11421161        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
    11431162          && { echo i486-ncr-sysv4; exit; } ;;
     1163    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
     1164        OS_REL='.3'
     1165        test -r /etc/.relid \
     1166            && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
     1167        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
     1168            && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
     1169        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
     1170            && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
     1171        /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
     1172            && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    11441173    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
    11451174        echo m68k-unknown-lynxos${UNAME_RELEASE}
     
    12161245    BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
    12171246        echo i586-pc-beos
     1247        exit ;;
     1248    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
     1249        echo i586-pc-haiku
    12181250        exit ;;
    12191251    SX-4:SUPER-UX:*:*)
     
    13241356    i*86:rdos:*:*)
    13251357        echo ${UNAME_MACHINE}-pc-rdos
     1358        exit ;;
     1359    i*86:AROS:*:*)
     1360        echo ${UNAME_MACHINE}-pc-aros
    13261361        exit ;;
    13271362esac
Note: See TracChangeset for help on using the changeset viewer.