Diff for /embedaddon/pcre/config.guess between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/22 08:25:55 version 1.1.1.4, 2014/06/15 19:46:03
Line 2 Line 2
 # Attempt to guess a canonical system name.  # Attempt to guess a canonical system name.
 #   Copyright 1992-2013 Free Software Foundation, Inc.  #   Copyright 1992-2013 Free Software Foundation, Inc.
   
timestamp='2013-04-24'timestamp='2013-06-10'
   
 # This file is free software; you can redistribute it and/or modify it  # 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  # under the terms of the GNU General Public License as published by
Line 132  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEAS Line 132  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEAS
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   
   case "${UNAME_SYSTEM}" in
   Linux|GNU|GNU/*)
           # If the system lacks a compiler, then just pick glibc.
           # We could probably try harder.
           LIBC=gnu
   
           eval $set_cc_for_build
           cat <<-EOF > $dummy.c
           #include <features.h>
           #if defined(__UCLIBC__)
           LIBC=uclibc
           #elif defined(__dietlibc__)
           LIBC=dietlibc
           #else
           LIBC=gnu
           #endif
           EOF
           eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
           ;;
   esac
   
 # Note: order is significant - the case branches are not exclusive.  # Note: order is significant - the case branches are not exclusive.
   
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
Line 853  EOF Line 874  EOF
         exit ;;          exit ;;
     *:GNU:*:*)      *:GNU:*:*)
         # the GNU system          # the GNU system
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
         exit ;;          exit ;;
     *:GNU/*:*:*)      *:GNU/*:*:*)
         # other systems with GNU libc and userland          # other systems with GNU libc and userland
        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
         exit ;;          exit ;;
     i*86:Minix:*:*)      i*86:Minix:*:*)
         echo ${UNAME_MACHINE}-pc-minix          echo ${UNAME_MACHINE}-pc-minix
         exit ;;          exit ;;
     aarch64:Linux:*:*)      aarch64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     aarch64_be:Linux:*:*)      aarch64_be:Linux:*:*)
         UNAME_MACHINE=aarch64_be          UNAME_MACHINE=aarch64_be
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     alpha:Linux:*:*)      alpha:Linux:*:*)
         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in          case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
Line 880  EOF Line 901  EOF
           EV68*) UNAME_MACHINE=alphaev68 ;;            EV68*) UNAME_MACHINE=alphaev68 ;;
         esac          esac
         objdump --private-headers /bin/sh | grep -q ld.so.1          objdump --private-headers /bin/sh | grep -q ld.so.1
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)      arc:Linux:*:* | arceb:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     arm*:Linux:*:*)      arm*:Linux:*:*)
         eval $set_cc_for_build          eval $set_cc_for_build
         if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \          if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
             | grep -q __ARM_EABI__              | grep -q __ARM_EABI__
         then          then
            echo ${UNAME_MACHINE}-unknown-linux-gnu            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         else          else
             if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \              if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
                 | grep -q __ARM_PCS_VFP                  | grep -q __ARM_PCS_VFP
             then              then
                echo ${UNAME_MACHINE}-unknown-linux-gnueabi                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
             else              else
                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
             fi              fi
         fi          fi
         exit ;;          exit ;;
     avr32*:Linux:*:*)      avr32*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     cris:Linux:*:*)      cris:Linux:*:*)
        echo ${UNAME_MACHINE}-axis-linux-gnu        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
         exit ;;          exit ;;
     crisv32:Linux:*:*)      crisv32:Linux:*:*)
        echo ${UNAME_MACHINE}-axis-linux-gnu        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
         exit ;;          exit ;;
     frv:Linux:*:*)      frv:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     hexagon:Linux:*:*)      hexagon:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     i*86:Linux:*:*)      i*86:Linux:*:*)
        LIBC=gnu        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
        eval $set_cc_for_build 
        sed 's/^        //' << EOF >$dummy.c 
        #ifdef __dietlibc__ 
        LIBC=dietlibc 
        #endif 
        #else 
        #include <features.h> 
        #ifdef __UCLIBC__ 
        LIBC=uclibc 
        #endif 
EOF 
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` 
        echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 
         exit ;;          exit ;;
     ia64:Linux:*:*)      ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     m32r*:Linux:*:*)      m32r*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     m68*:Linux:*:*)      m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)      mips:Linux:*:* | mips64:Linux:*:*)
         eval $set_cc_for_build          eval $set_cc_for_build
Line 959  EOF Line 967  EOF
         #endif          #endif
 EOF  EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`          eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
         ;;          ;;
     or1k:Linux:*:*)      or1k:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     or32:Linux:*:*)      or32:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     padre:Linux:*:*)      padre:Linux:*:*)
        echo sparc-unknown-linux-gnu        echo sparc-unknown-linux-${LIBC}
         exit ;;          exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)      parisc64:Linux:*:* | hppa64:Linux:*:*)
        echo hppa64-unknown-linux-gnu        echo hppa64-unknown-linux-${LIBC}
         exit ;;          exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)      parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level          # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in          case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
          PA7*) echo hppa1.1-unknown-linux-gnu ;;          PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
          PA8*) echo hppa2.0-unknown-linux-gnu ;;          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
          *)    echo hppa-unknown-linux-gnu ;;          *)    echo hppa-unknown-linux-${LIBC} ;;
         esac          esac
         exit ;;          exit ;;
     ppc64:Linux:*:*)      ppc64:Linux:*:*)
        echo powerpc64-unknown-linux-gnu        echo powerpc64-unknown-linux-${LIBC}
         exit ;;          exit ;;
     ppc:Linux:*:*)      ppc:Linux:*:*)
        echo powerpc-unknown-linux-gnu        echo powerpc-unknown-linux-${LIBC}
         exit ;;          exit ;;
       ppc64le:Linux:*:*)
           echo powerpc64le-unknown-linux-${LIBC}
           exit ;;
       ppcle:Linux:*:*)
           echo powerpcle-unknown-linux-${LIBC}
           exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)      s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
         exit ;;          exit ;;
     sh64*:Linux:*:*)      sh64*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     sh*:Linux:*:*)      sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)      sparc:Linux:*:* | sparc64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     tile*:Linux:*:*)      tile*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     vax:Linux:*:*)      vax:Linux:*:*)
        echo ${UNAME_MACHINE}-dec-linux-gnu        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
         exit ;;          exit ;;
     x86_64:Linux:*:*)      x86_64:Linux:*:*)
         LIBC=gnu  
         test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc  
         echo ${UNAME_MACHINE}-unknown-linux-${LIBC}          echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     xtensa*:Linux:*:*)      xtensa*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;          exit ;;
     i*86:DYNIX/ptx:4*:*)      i*86:DYNIX/ptx:4*:*)
         # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.          # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
Line 1244  EOF Line 1256  EOF
         exit ;;          exit ;;
     *:Darwin:*:*)      *:Darwin:*:*)
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown          UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
        case $UNAME_PROCESSOR in        eval $set_cc_for_build
            i386)        if test "$UNAME_PROCESSOR" = unknown ; then
                eval $set_cc_for_build            UNAME_PROCESSOR=powerpc
                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then        fi
                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \            if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
                      grep IS_64BIT_ARCH >/dev/null                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
                  then                grep IS_64BIT_ARCH >/dev/null
                      UNAME_PROCESSOR="x86_64"            then
                  fi                case $UNAME_PROCESSOR in
                fi ;;                    i386) UNAME_PROCESSOR=x86_64 ;;
            unknown) UNAME_PROCESSOR=powerpc ;;                    powerpc) UNAME_PROCESSOR=powerpc64 ;;
        esac                esac
             fi
         fi
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}          echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
         exit ;;          exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)      *:procnto*:*:* | *:QNX:[0123456789]*:*)

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>