Changeset 58838


Ignore:
Timestamp:
Oct 6, 2009, 5:22:47 AM (10 years ago)
Author:
toby@…
Message:

base: update config.* for the lulz

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/config.guess

    r51217 r58838  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    55#   Free Software Foundation, Inc.
    66
    7 timestamp='2009-04-27'
     7timestamp='2009-09-18'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    2828
    2929
    30 # Originally written by Per Bothner <per@bothner.com>.
    31 # Please send patches to <config-patches@gnu.org>.  Submit a context
    32 # diff and a properly formatted ChangeLog entry.
     30# Originally written by Per Bothner.  Please send patches (context
     31# diff format) to <config-patches@gnu.org> and include a ChangeLog
     32# entry.
    3333#
    3434# This script attempts to guess a canonical system name similar to
     
    3636# exits with 0.  Otherwise, it exits with 1.
    3737#
    38 # The plan is that this can be called by configure scripts if you
    39 # don't specify an explicit build system type.
     38# You can get the latest version of this script from:
     39# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
    4040
    4141me=`echo "$0" | sed -e 's,.*/,,'`
     
    171171                eval $set_cc_for_build
    172172                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
    173                         | grep __ELF__ >/dev/null
     173                        | grep -q __ELF__
    174174                then
    175175                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
     
    657657
    658658            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
    659                 grep __LP64__ >/dev/null
     659                grep -q __LP64__
    660660            then
    661661                HP_ARCH="hppa2.0w"
     
    823823        echo i${UNAME_MACHINE}-pc-mks
    824824        exit ;;
     825    8664:Windows_NT:*)
     826        echo x86_64-pc-mks
     827        exit ;;
    825828    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
    826829        # How do we know it's Interix rather than the generic POSIX subsystem?
     
    851854    i*86:Minix:*:*)
    852855        echo ${UNAME_MACHINE}-pc-minix
     856        exit ;;
     857    alpha:Linux:*:*)
     858        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
     859          EV5)   UNAME_MACHINE=alphaev5 ;;
     860          EV56)  UNAME_MACHINE=alphaev56 ;;
     861          PCA56) UNAME_MACHINE=alphapca56 ;;
     862          PCA57) UNAME_MACHINE=alphapca56 ;;
     863          EV6)   UNAME_MACHINE=alphaev6 ;;
     864          EV67)  UNAME_MACHINE=alphaev67 ;;
     865          EV68*) UNAME_MACHINE=alphaev68 ;;
     866        esac
     867        objdump --private-headers /bin/sh | grep -q ld.so.1
     868        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
     869        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
    853870        exit ;;
    854871    arm*:Linux:*:*)
     
    874891        echo frv-unknown-linux-gnu
    875892        exit ;;
     893    i*86:Linux:*:*)
     894        echo ${UNAME_MACHINE}-pc-linux-gnu
     895        exit ;;
    876896    ia64:Linux:*:*)
    877897        echo ${UNAME_MACHINE}-unknown-linux-gnu
     
    883903        echo ${UNAME_MACHINE}-unknown-linux-gnu
    884904        exit ;;
    885     mips:Linux:*:*)
     905    mips:Linux:*:* | mips64:Linux:*:*)
    886906        eval $set_cc_for_build
    887907        sed 's/^        //' << EOF >$dummy.c
    888908        #undef CPU
    889         #undef mips
    890         #undef mipsel
     909        #undef ${UNAME_MACHINE}
     910        #undef ${UNAME_MACHINE}el
    891911        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    892         CPU=mipsel
     912        CPU=${UNAME_MACHINE}el
    893913        #else
    894914        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    895         CPU=mips
    896         #else
    897         CPU=
    898         #endif
    899         #endif
    900 EOF
    901         eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    902             /^CPU/{
    903                 s: ::g
    904                 p
    905             }'`"
    906         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    907         ;;
    908     mips64:Linux:*:*)
    909         eval $set_cc_for_build
    910         sed 's/^        //' << EOF >$dummy.c
    911         #undef CPU
    912         #undef mips64
    913         #undef mips64el
    914         #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    915         CPU=mips64el
    916         #else
    917         #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    918         CPU=mips64
     915        CPU=${UNAME_MACHINE}
    919916        #else
    920917        CPU=
     
    932929        echo or32-unknown-linux-gnu
    933930        exit ;;
    934     ppc:Linux:*:*)
    935         echo powerpc-unknown-linux-gnu
    936         exit ;;
    937     ppc64:Linux:*:*)
    938         echo powerpc64-unknown-linux-gnu
    939         exit ;;
    940     alpha:Linux:*:*)
    941         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
    942           EV5)   UNAME_MACHINE=alphaev5 ;;
    943           EV56)  UNAME_MACHINE=alphaev56 ;;
    944           PCA56) UNAME_MACHINE=alphapca56 ;;
    945           PCA57) UNAME_MACHINE=alphapca56 ;;
    946           EV6)   UNAME_MACHINE=alphaev6 ;;
    947           EV67)  UNAME_MACHINE=alphaev67 ;;
    948           EV68*) UNAME_MACHINE=alphaev68 ;;
    949         esac
    950         objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
    951         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
    952         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
    953         exit ;;
    954931    padre:Linux:*:*)
    955932        echo sparc-unknown-linux-gnu
     933        exit ;;
     934    parisc64:Linux:*:* | hppa64:Linux:*:*)
     935        echo hppa64-unknown-linux-gnu
    956936        exit ;;
    957937    parisc:Linux:*:* | hppa:Linux:*:*)
     
    963943        esac
    964944        exit ;;
    965     parisc64:Linux:*:* | hppa64:Linux:*:*)
    966         echo hppa64-unknown-linux-gnu
     945    ppc64:Linux:*:*)
     946        echo powerpc64-unknown-linux-gnu
     947        exit ;;
     948    ppc:Linux:*:*)
     949        echo powerpc-unknown-linux-gnu
    967950        exit ;;
    968951    s390:Linux:*:* | s390x:Linux:*:*)
     
    987970        echo ${UNAME_MACHINE}-unknown-linux-gnu
    988971        exit ;;
    989     i*86:Linux:*:*)
    990         # The BFD linker knows what the default object file format is, so
    991         # first see if it will tell us. cd to the root directory to prevent
    992         # problems with other programs or directories called `ld' in the path.
    993         # Set LC_ALL=C to ensure ld outputs messages in English.
    994         ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
    995                          | sed -ne '/supported targets:/!d
    996                                     s/[         ][      ]*/ /g
    997                                     s/.*supported targets: *//
    998                                     s/ .*//
    999                                     p'`
    1000         case "$ld_supported_targets" in
    1001           elf32-i386)
    1002                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
    1003                 ;;
    1004           a.out-i386-linux)
    1005                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
    1006                 exit ;;
    1007           "")
    1008                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
    1009                 # one that does not give us useful --help.
    1010                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
    1011                 exit ;;
    1012         esac
    1013         # Determine whether the default compiler is a.out or elf
    1014         eval $set_cc_for_build
    1015         sed 's/^        //' << EOF >$dummy.c
    1016         #include <features.h>
    1017         #ifdef __ELF__
    1018         # ifdef __GLIBC__
    1019         #  if __GLIBC__ >= 2
    1020         LIBC=gnu
    1021         #  else
    1022         LIBC=gnulibc1
    1023         #  endif
    1024         # else
    1025         LIBC=gnulibc1
    1026         # endif
    1027         #else
    1028         #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
    1029         LIBC=gnu
    1030         #else
    1031         LIBC=gnuaout
    1032         #endif
    1033         #endif
    1034         #ifdef __dietlibc__
    1035         LIBC=dietlibc
    1036         #endif
    1037 EOF
    1038         eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    1039             /^LIBC/{
    1040                 s: ::g
    1041                 p
    1042             }'`"
    1043         test x"${LIBC}" != x && {
    1044                 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
    1045                 exit
    1046         }
    1047         test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
    1048         ;;
    1049972    i*86:DYNIX/ptx:4*:*)
    1050973        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
     
    1075998        echo ${UNAME_MACHINE}-pc-syllable
    1076999        exit ;;
    1077     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
     1000    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
    10781001        echo i386-unknown-lynxos${UNAME_RELEASE}
    10791002        exit ;;
     
    11831106        echo rs6000-unknown-lynxos${UNAME_RELEASE}
    11841107        exit ;;
    1185     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
     1108    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
    11861109        echo powerpc-unknown-lynxos${UNAME_RELEASE}
    11871110        exit ;;
     
    12761199        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
    12771200        case $UNAME_PROCESSOR in
     1201            i386)
     1202                eval $set_cc_for_build
     1203                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     1204                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
     1205                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     1206                      grep IS_64BIT_ARCH >/dev/null
     1207                  then
     1208                      UNAME_PROCESSOR="x86_64"
     1209                  fi
     1210                fi ;;
    12781211            unknown) UNAME_PROCESSOR=powerpc ;;
    12791212        esac
  • trunk/base/config.sub

    r51217 r58838  
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    55#   Free Software Foundation, Inc.
    66
    7 timestamp='2009-04-17'
     7timestamp='2009-09-25'
    88
    99# This file is (in principle) common to ALL GNU software.
     
    3333
    3434# Please send patches to <config-patches@gnu.org>.  Submit a context
    35 # diff and a properly formatted ChangeLog entry.
     35# diff and a properly formatted GNU ChangeLog entry.
    3636#
    3737# Configuration subroutine to validate and canonicalize a configuration type.
     
    3939# If it is invalid, we print an error message on stderr and exit with code 1.
    4040# Otherwise, we print the canonical config type on stdout and succeed.
     41
     42# You can get the latest version of this script from:
     43# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
    4144
    4245# This file is supposed to be the same for all GNU packages
     
    150153        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
    151154        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
    152         -apple | -axis | -knuth | -cray)
     155        -apple | -axis | -knuth | -cray | -microblaze)
    153156                os=
    154157                basic_machine=$1
     158                ;;
     159        -bluegene*)
     160                os=-cnk
    155161                ;;
    156162        -sim | -cisco | -oki | -wec | -winbond)
     
    282288        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    283289        | pyramid \
     290        | rx \
    284291        | score \
    285292        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     
    295302                basic_machine=$basic_machine-unknown
    296303                ;;
    297         m6811 | m68hc11 | m6812 | m68hc12)
     304        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
    298305                # Motorola 68HC11/12.
    299306                basic_machine=$basic_machine-unknown
     
    338345        | m32c-* | m32r-* | m32rle-* \
    339346        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    340         | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
     347        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
    341348        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
    342349        | mips16-* \
     
    366373        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
    367374        | pyramid-* \
    368         | romp-* | rs6000-* \
     375        | romp-* | rs6000-* | rx-* \
    369376        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
    370377        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
     
    468475                os=-linux
    469476                ;;
     477        bluegene*)
     478                basic_machine=powerpc-ibm
     479                os=-cnk
     480                ;;
    470481        c90)
    471482                basic_machine=c90-cray
     
    719730                basic_machine=ns32k-utek
    720731                os=-sysv
     732                ;;
     733        microblaze)
     734                basic_machine=microblaze-xilinx
    721735                ;;
    722736        mingw32)
     
    12611275        # -sysv* is not here because it comes later, after sysvr4.
    12621276        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
    1263               | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
     1277              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
    12641278              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
    12651279              | -kopensolaris* \
     
    16141628                                vendor=sun
    16151629                                ;;
    1616                         -aix*)
     1630                        -cnk*|-aix*)
    16171631                                vendor=ibm
    16181632                                ;;
Note: See TracChangeset for help on using the changeset viewer.