Ignore:
Timestamp:
Sep 24, 2014, 9:34:21 PM (11 years ago)
Author:
dmik
Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/icedtea-web/config.guess

    r418 r429  
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    44#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    5 #   2011, 2012 Free Software Foundation, Inc.
    6 
    7 timestamp='2012-01-01'
     5#   2011, 2012, 2013 Free Software Foundation, Inc.
     6
     7timestamp='2012-12-29'
    88
    99# This file is free software; you can redistribute it and/or modify it
    1010# under the terms of the GNU General Public License as published by
    11 # the Free Software Foundation; either version 2 of the License, or
     11# the Free Software Foundation; either version 3 of the License, or
    1212# (at your option) any later version.
    1313#
    … …  
    1818#
    1919# You should have received a copy of the GNU General Public License
    20 # along with this program; if not, write to the Free Software
    21 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    22 # 02110-1301, USA.
     20# along with this program; if not, see <http://www.gnu.org/licenses/>.
    2321#
    2422# As a special exception to the GNU General Public License, if you
    2523# distribute this file as part of a program that contains a
    2624# configuration script generated by Autoconf, you may include it under
    27 # the same distribution terms that you use for the rest of that program.
    28 
    29 
    30 # Originally written by Per Bothner.  Please send patches (context
    31 # diff format) to <config-patches@gnu.org> and include a ChangeLog
    32 # entry.
     25# the same distribution terms that you use for the rest of that
     26# program.  This Exception is an additional permission under section 7
     27# of the GNU General Public License, version 3 ("GPLv3").
    3328#
    34 # This script attempts to guess a canonical system name similar to
    35 # config.sub.  If it succeeds, it prints the system name on stdout, and
    36 # exits with 0.  Otherwise, it exits with 1.
     29# Originally written by Per Bothner.
    3730#
    3831# You can get the latest version of this script from:
    3932# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
     33#
     34# Please send patches with a ChangeLog entry to config-patches@gnu.org.
     35
    4036
    4137me=`echo "$0" | sed -e 's,.*/,,'`
    … …  
    5854Originally written by Per Bothner.
    5955Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    60 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    61 Free Software Foundation, Inc.
     562001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
     572012, 2013 Free Software Foundation, Inc.
    6258
    6359This is free software; see the source for copying conditions.  There is NO
    … …  
    202198        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    203199        echo "${machine}-${os}${release}"
     200        exit ;;
     201    *:Bitrig:*:*)
     202        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
     203        echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
    204204        exit ;;
    205205    *:OpenBSD:*:*)
    … …  
    305305        echo arm-acorn-riscix${UNAME_RELEASE}
    306306        exit ;;
    307     arm:riscos:*:*|arm:RISCOS:*:*)
     307    arm*:riscos:*:*|arm*:RISCOS:*:*)
    308308        echo arm-unknown-riscos
    309309        exit ;;
    … …  
    804804        echo ${UNAME_MACHINE}-pc-cygwin
    805805        exit ;;
     806    *:MINGW64*:*)
     807        echo ${UNAME_MACHINE}-pc-mingw64
     808        exit ;;
    806809    *:MINGW*:*)
    807810        echo ${UNAME_MACHINE}-pc-mingw32
    … …  
    863866    i*86:Minix:*:*)
    864867        echo ${UNAME_MACHINE}-pc-minix
     868        exit ;;
     869    aarch64:Linux:*:*)
     870        echo ${UNAME_MACHINE}-unknown-linux-gnu
     871        exit ;;
     872    aarch64_be:Linux:*:*)
     873        UNAME_MACHINE=aarch64_be
     874        echo ${UNAME_MACHINE}-unknown-linux-gnu
    865875        exit ;;
    866876    alpha:Linux:*:*)
    … …  
    11971207        echo i586-pc-haiku
    11981208        exit ;;
     1209    x86_64:Haiku:*:*)
     1210        echo x86_64-unknown-haiku
     1211        exit ;;
    11991212    SX-4:SUPER-UX:*:*)
    12001213        echo sx4-nec-superux${UNAME_RELEASE}
    … …  
    12521265        echo neo-tandem-nsk${UNAME_RELEASE}
    12531266        exit ;;
    1254     NSE-?:NONSTOP_KERNEL:*:*)
     1267    NSE-*:NONSTOP_KERNEL:*:*)
    12551268        echo nse-tandem-nsk${UNAME_RELEASE}
    12561269        exit ;;
    … …  
    13211334        echo ${UNAME_MACHINE}-pc-aros
    13221335        exit ;;
     1336    x86_64:VMkernel:*:*)
     1337        echo ${UNAME_MACHINE}-unknown-esx
     1338        exit ;;
    13231339esac
    1324 
    1325 #echo '(No uname command or uname output not recognized.)' 1>&2
    1326 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
    13271340
    13281341eval $set_cc_for_build
Note: See TracChangeset for help on using the changeset viewer.