Changeset 67f89f2 in rtems


Ignore:
Timestamp:
Jun 18, 2013, 11:37:16 AM (6 years ago)
Author:
Ralf Corsépius <ralf.corsepius@…>
Branches:
4.11, master
Children:
3f6a823
Parents:
49bc9f81
git-author:
Ralf Corsépius <ralf.corsepius@…> (06/18/13 11:37:16)
git-committer:
Ralf Corsépius <ralf.corsepius@…> (06/18/13 11:38:31)
Message:

Update from automake-1.13.3.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • config.guess

    r49bc9f81 r67f89f2  
    33#   Copyright 1992-2013 Free Software Foundation, Inc.
    44
    5 timestamp='2013-04-24'
     5timestamp='2013-06-10'
    66
    77# This file is free software; you can redistribute it and/or modify it
     
    132132UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
    133133UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
     134
     135case "${UNAME_SYSTEM}" in
     136Linux|GNU|GNU/*)
     137        # If the system lacks a compiler, then just pick glibc.
     138        # We could probably try harder.
     139        LIBC=gnu
     140
     141        eval $set_cc_for_build
     142        cat <<-EOF > $dummy.c
     143        #include <features.h>
     144        #if defined(__UCLIBC__)
     145        LIBC=uclibc
     146        #elif defined(__dietlibc__)
     147        LIBC=dietlibc
     148        #else
     149        LIBC=gnu
     150        #endif
     151        EOF
     152        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
     153        ;;
     154esac
    134155
    135156# Note: order is significant - the case branches are not exclusive.
     
    854875    *:GNU:*:*)
    855876        # the GNU system
    856         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
     877        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
    857878        exit ;;
    858879    *:GNU/*:*:*)
    859880        # other systems with GNU libc and userland
    860         echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
     881        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
    861882        exit ;;
    862883    i*86:Minix:*:*)
     
    864885        exit ;;
    865886    aarch64:Linux:*:*)
    866         echo ${UNAME_MACHINE}-unknown-linux-gnu
     887        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    867888        exit ;;
    868889    aarch64_be:Linux:*:*)
    869890        UNAME_MACHINE=aarch64_be
    870         echo ${UNAME_MACHINE}-unknown-linux-gnu
     891        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    871892        exit ;;
    872893    alpha:Linux:*:*)
     
    881902        esac
    882903        objdump --private-headers /bin/sh | grep -q ld.so.1
    883         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
    884         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     904        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
     905        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    885906        exit ;;
    886907    arc:Linux:*:* | arceb:Linux:*:*)
    887         echo ${UNAME_MACHINE}-unknown-linux-gnu
     908        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    888909        exit ;;
    889910    arm*:Linux:*:*)
     
    892913            | grep -q __ARM_EABI__
    893914        then
    894             echo ${UNAME_MACHINE}-unknown-linux-gnu
     915            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    895916        else
    896917            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
    897918                | grep -q __ARM_PCS_VFP
    898919            then
    899                 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
     920                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
    900921            else
    901                 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
     922                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
    902923            fi
    903924        fi
    904925        exit ;;
    905926    avr32*:Linux:*:*)
    906         echo ${UNAME_MACHINE}-unknown-linux-gnu
     927        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    907928        exit ;;
    908929    cris:Linux:*:*)
    909         echo ${UNAME_MACHINE}-axis-linux-gnu
     930        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
    910931        exit ;;
    911932    crisv32:Linux:*:*)
    912         echo ${UNAME_MACHINE}-axis-linux-gnu
     933        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
    913934        exit ;;
    914935    frv:Linux:*:*)
    915         echo ${UNAME_MACHINE}-unknown-linux-gnu
     936        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    916937        exit ;;
    917938    hexagon:Linux:*:*)
    918         echo ${UNAME_MACHINE}-unknown-linux-gnu
     939        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    919940        exit ;;
    920941    i*86:Linux:*:*)
    921         LIBC=gnu
    922         eval $set_cc_for_build
    923         sed 's/^        //' << EOF >$dummy.c
    924         #ifdef __dietlibc__
    925         LIBC=dietlibc
    926         #endif
    927         #else
    928         #include <features.h>
    929         #ifdef __UCLIBC__
    930         LIBC=uclibc
    931         #endif
    932 EOF
    933         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
    934         echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
     942        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
    935943        exit ;;
    936944    ia64:Linux:*:*)
    937         echo ${UNAME_MACHINE}-unknown-linux-gnu
     945        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    938946        exit ;;
    939947    m32r*:Linux:*:*)
    940         echo ${UNAME_MACHINE}-unknown-linux-gnu
     948        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    941949        exit ;;
    942950    m68*:Linux:*:*)
    943         echo ${UNAME_MACHINE}-unknown-linux-gnu
     951        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    944952        exit ;;
    945953    mips:Linux:*:* | mips64:Linux:*:*)
     
    960968EOF
    961969        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
    962         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
     970        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
    963971        ;;
    964972    or1k:Linux:*:*)
    965         echo ${UNAME_MACHINE}-unknown-linux-gnu
     973        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    966974        exit ;;
    967975    or32:Linux:*:*)
    968         echo ${UNAME_MACHINE}-unknown-linux-gnu
     976        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    969977        exit ;;
    970978    padre:Linux:*:*)
    971         echo sparc-unknown-linux-gnu
     979        echo sparc-unknown-linux-${LIBC}
    972980        exit ;;
    973981    parisc64:Linux:*:* | hppa64:Linux:*:*)
    974         echo hppa64-unknown-linux-gnu
     982        echo hppa64-unknown-linux-${LIBC}
    975983        exit ;;
    976984    parisc:Linux:*:* | hppa:Linux:*:*)
    977985        # Look for CPU level
    978986        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
    979           PA7*) echo hppa1.1-unknown-linux-gnu ;;
    980           PA8*) echo hppa2.0-unknown-linux-gnu ;;
    981           *)    echo hppa-unknown-linux-gnu ;;
     987          PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
     988          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
     989          *)    echo hppa-unknown-linux-${LIBC} ;;
    982990        esac
    983991        exit ;;
    984992    ppc64:Linux:*:*)
    985         echo powerpc64-unknown-linux-gnu
     993        echo powerpc64-unknown-linux-${LIBC}
    986994        exit ;;
    987995    ppc:Linux:*:*)
    988         echo powerpc-unknown-linux-gnu
     996        echo powerpc-unknown-linux-${LIBC}
     997        exit ;;
     998    ppc64le:Linux:*:*)
     999        echo powerpc64le-unknown-linux-${LIBC}
     1000        exit ;;
     1001    ppcle:Linux:*:*)
     1002        echo powerpcle-unknown-linux-${LIBC}
    9891003        exit ;;
    9901004    s390:Linux:*:* | s390x:Linux:*:*)
    991         echo ${UNAME_MACHINE}-ibm-linux
     1005        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
    9921006        exit ;;
    9931007    sh64*:Linux:*:*)
    994         echo ${UNAME_MACHINE}-unknown-linux-gnu
     1008        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    9951009        exit ;;
    9961010    sh*:Linux:*:*)
    997         echo ${UNAME_MACHINE}-unknown-linux-gnu
     1011        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    9981012        exit ;;
    9991013    sparc:Linux:*:* | sparc64:Linux:*:*)
    1000         echo ${UNAME_MACHINE}-unknown-linux-gnu
     1014        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    10011015        exit ;;
    10021016    tile*:Linux:*:*)
    1003         echo ${UNAME_MACHINE}-unknown-linux-gnu
     1017        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    10041018        exit ;;
    10051019    vax:Linux:*:*)
    1006         echo ${UNAME_MACHINE}-dec-linux-gnu
     1020        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
    10071021        exit ;;
    10081022    x86_64:Linux:*:*)
    1009         LIBC=gnu
    1010         test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc
    10111023        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    10121024        exit ;;
    10131025    xtensa*:Linux:*:*)
    1014         echo ${UNAME_MACHINE}-unknown-linux-gnu
     1026        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    10151027        exit ;;
    10161028    i*86:DYNIX/ptx:4*:*)
     
    12451257    *:Darwin:*:*)
    12461258        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
    1247         case $UNAME_PROCESSOR in
    1248             i386)
    1249                 eval $set_cc_for_build
    1250                 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
    1251                   if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
    1252                       (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
    1253                       grep IS_64BIT_ARCH >/dev/null
    1254                   then
    1255                       UNAME_PROCESSOR="x86_64"
    1256                   fi
    1257                 fi ;;
    1258             unknown) UNAME_PROCESSOR=powerpc ;;
    1259         esac
     1259        eval $set_cc_for_build
     1260        if test "$UNAME_PROCESSOR" = unknown ; then
     1261            UNAME_PROCESSOR=powerpc
     1262        fi
     1263        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     1264            if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
     1265                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     1266                grep IS_64BIT_ARCH >/dev/null
     1267            then
     1268                case $UNAME_PROCESSOR in
     1269                    i386) UNAME_PROCESSOR=x86_64 ;;
     1270                    powerpc) UNAME_PROCESSOR=powerpc64 ;;
     1271                esac
     1272            fi
     1273        fi
    12601274        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    12611275        exit ;;
  • depcomp

    r49bc9f81 r67f89f2  
    22# depcomp - compile a program generating dependencies as side-effects
    33
    4 scriptversion=2012-10-18.11; # UTC
     4scriptversion=2013-05-30.07; # UTC
    55
    66# Copyright (C) 1999-2013 Free Software Foundation, Inc.
     
    553553  p
    554554}' >> "$depfile"
     555  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
    555556  rm -f "$tmpdepfile"
    556557  ;;
Note: See TracChangeset for help on using the changeset viewer.