1.1 --- a/scripts/config.guess Tue Dec 31 13:02:57 2013 +0100
1.2 +++ b/scripts/config.guess Fri Feb 21 23:28:12 2014 -0800
1.3 @@ -1,8 +1,8 @@
1.4 #! /bin/sh
1.5 # Attempt to guess a canonical system name.
1.6 -# Copyright 1992-2013 Free Software Foundation, Inc.
1.7 +# Copyright 1992-2014 Free Software Foundation, Inc.
1.8
1.9 -timestamp='2013-11-29'
1.10 +timestamp='2014-03-23'
1.11
1.12 # This file is free software; you can redistribute it and/or modify it
1.13 # under the terms of the GNU General Public License as published by
1.14 @@ -50,7 +50,7 @@
1.15 GNU config.guess ($timestamp)
1.16
1.17 Originally written by Per Bothner.
1.18 -Copyright 1992-2013 Free Software Foundation, Inc.
1.19 +Copyright 1992-2014 Free Software Foundation, Inc.
1.20
1.21 This is free software; see the source for copying conditions. There is NO
1.22 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1.23 @@ -149,7 +149,7 @@
1.24 LIBC=gnu
1.25 #endif
1.26 EOF
1.27 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
1.28 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
1.29 ;;
1.30 esac
1.31
1.32 @@ -826,7 +826,7 @@
1.33 *:MINGW*:*)
1.34 echo ${UNAME_MACHINE}-pc-mingw32
1.35 exit ;;
1.36 - i*:MSYS*:*)
1.37 + *:MSYS*:*)
1.38 echo ${UNAME_MACHINE}-pc-msys
1.39 exit ;;
1.40 i*:windows32*:*)
1.41 @@ -969,10 +969,10 @@
1.42 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
1.43 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
1.44 ;;
1.45 - or1k:Linux:*:*)
1.46 - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1.47 + openrisc*:Linux:*:*)
1.48 + echo or1k-unknown-linux-${LIBC}
1.49 exit ;;
1.50 - or32:Linux:*:*)
1.51 + or32:Linux:*:* | or1k*:Linux:*:*)
1.52 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1.53 exit ;;
1.54 padre:Linux:*:*)
1.55 @@ -1371,154 +1371,6 @@
1.56 exit ;;
1.57 esac
1.58
1.59 -eval $set_cc_for_build
1.60 -cat >$dummy.c <<EOF
1.61 -#ifdef _SEQUENT_
1.62 -# include <sys/types.h>
1.63 -# include <sys/utsname.h>
1.64 -#endif
1.65 -main ()
1.66 -{
1.67 -#if defined (sony)
1.68 -#if defined (MIPSEB)
1.69 - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1.70 - I don't know.... */
1.71 - printf ("mips-sony-bsd\n"); exit (0);
1.72 -#else
1.73 -#include <sys/param.h>
1.74 - printf ("m68k-sony-newsos%s\n",
1.75 -#ifdef NEWSOS4
1.76 - "4"
1.77 -#else
1.78 - ""
1.79 -#endif
1.80 - ); exit (0);
1.81 -#endif
1.82 -#endif
1.83 -
1.84 -#if defined (__arm) && defined (__acorn) && defined (__unix)
1.85 - printf ("arm-acorn-riscix\n"); exit (0);
1.86 -#endif
1.87 -
1.88 -#if defined (hp300) && !defined (hpux)
1.89 - printf ("m68k-hp-bsd\n"); exit (0);
1.90 -#endif
1.91 -
1.92 -#if defined (NeXT)
1.93 -#if !defined (__ARCHITECTURE__)
1.94 -#define __ARCHITECTURE__ "m68k"
1.95 -#endif
1.96 - int version;
1.97 - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1.98 - if (version < 4)
1.99 - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1.100 - else
1.101 - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1.102 - exit (0);
1.103 -#endif
1.104 -
1.105 -#if defined (MULTIMAX) || defined (n16)
1.106 -#if defined (UMAXV)
1.107 - printf ("ns32k-encore-sysv\n"); exit (0);
1.108 -#else
1.109 -#if defined (CMU)
1.110 - printf ("ns32k-encore-mach\n"); exit (0);
1.111 -#else
1.112 - printf ("ns32k-encore-bsd\n"); exit (0);
1.113 -#endif
1.114 -#endif
1.115 -#endif
1.116 -
1.117 -#if defined (__386BSD__)
1.118 - printf ("i386-pc-bsd\n"); exit (0);
1.119 -#endif
1.120 -
1.121 -#if defined (sequent)
1.122 -#if defined (i386)
1.123 - printf ("i386-sequent-dynix\n"); exit (0);
1.124 -#endif
1.125 -#if defined (ns32000)
1.126 - printf ("ns32k-sequent-dynix\n"); exit (0);
1.127 -#endif
1.128 -#endif
1.129 -
1.130 -#if defined (_SEQUENT_)
1.131 - struct utsname un;
1.132 -
1.133 - uname(&un);
1.134 -
1.135 - if (strncmp(un.version, "V2", 2) == 0) {
1.136 - printf ("i386-sequent-ptx2\n"); exit (0);
1.137 - }
1.138 - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1.139 - printf ("i386-sequent-ptx1\n"); exit (0);
1.140 - }
1.141 - printf ("i386-sequent-ptx\n"); exit (0);
1.142 -
1.143 -#endif
1.144 -
1.145 -#if defined (vax)
1.146 -# if !defined (ultrix)
1.147 -# include <sys/param.h>
1.148 -# if defined (BSD)
1.149 -# if BSD == 43
1.150 - printf ("vax-dec-bsd4.3\n"); exit (0);
1.151 -# else
1.152 -# if BSD == 199006
1.153 - printf ("vax-dec-bsd4.3reno\n"); exit (0);
1.154 -# else
1.155 - printf ("vax-dec-bsd\n"); exit (0);
1.156 -# endif
1.157 -# endif
1.158 -# else
1.159 - printf ("vax-dec-bsd\n"); exit (0);
1.160 -# endif
1.161 -# else
1.162 - printf ("vax-dec-ultrix\n"); exit (0);
1.163 -# endif
1.164 -#endif
1.165 -
1.166 -#if defined (alliant) && defined (i860)
1.167 - printf ("i860-alliant-bsd\n"); exit (0);
1.168 -#endif
1.169 -
1.170 - exit (1);
1.171 -}
1.172 -EOF
1.173 -
1.174 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1.175 - { echo "$SYSTEM_NAME"; exit; }
1.176 -
1.177 -# Apollos put the system type in the environment.
1.178 -
1.179 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1.180 -
1.181 -# Convex versions that predate uname can use getsysinfo(1)
1.182 -
1.183 -if [ -x /usr/convex/getsysinfo ]
1.184 -then
1.185 - case `getsysinfo -f cpu_type` in
1.186 - c1*)
1.187 - echo c1-convex-bsd
1.188 - exit ;;
1.189 - c2*)
1.190 - if getsysinfo -f scalar_acc
1.191 - then echo c32-convex-bsd
1.192 - else echo c2-convex-bsd
1.193 - fi
1.194 - exit ;;
1.195 - c34*)
1.196 - echo c34-convex-bsd
1.197 - exit ;;
1.198 - c38*)
1.199 - echo c38-convex-bsd
1.200 - exit ;;
1.201 - c4*)
1.202 - echo c4-convex-bsd
1.203 - exit ;;
1.204 - esac
1.205 -fi
1.206 -
1.207 cat >&2 <<EOF
1.208 $0: unable to guess system type
1.209