| blob | 628040d5030991a447da2de4bf6473e984978a8e |
1 Only in gnumeric-1.10.17.orig: aclocal.m4
2 diff -ru gnumeric-1.10.17.orig/config.guess gnumeric-1.10.17/config.guess
3 --- gnumeric-1.10.17.orig/config.guess 2011-07-07 13:40:02.000000000 +0200
4 +++ gnumeric-1.10.17/config.guess 2011-08-01 13:15:45.000000000 +0200
5 @@ -1,10 +1,10 @@
6 #! /bin/sh
7 # Attempt to guess a canonical system name.
8 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
9 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
10 -# Free Software Foundation, Inc.
11 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
12 +# 2011 Free Software Foundation, Inc.
14 -timestamp='2009-11-20'
15 +timestamp='2011-05-11'
17 # This file is free software; you can redistribute it and/or modify it
18 # under the terms of the GNU General Public License as published by
19 @@ -56,8 +56,9 @@
20 GNU config.guess ($timestamp)
22 Originally written by Per Bothner.
23 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
24 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
25 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
26 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
27 +Software Foundation, Inc.
29 This is free software; see the source for copying conditions. There is NO
30 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
31 @@ -139,16 +140,6 @@
32 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
33 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
35 -case "${UNAME_MACHINE}" in
36 - i?86)
37 - test -z "$VENDOR" && VENDOR=pc
38 - ;;
39 - *)
40 - test -z "$VENDOR" && VENDOR=unknown
41 - ;;
42 -esac
43 -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
44 -
45 # Note: order is significant - the case branches are not exclusive.
47 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
48 @@ -190,7 +181,7 @@
49 fi
50 ;;
51 *)
52 - os=netbsd
53 + os=netbsd
54 ;;
55 esac
56 # The OS release
57 @@ -213,19 +204,19 @@
58 exit ;;
59 *:OpenBSD:*:*)
60 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
61 - echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
62 + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
63 exit ;;
64 *:ekkoBSD:*:*)
65 - echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
66 + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
67 exit ;;
68 *:SolidBSD:*:*)
69 - echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
70 + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
71 exit ;;
72 macppc:MirBSD:*:*)
73 - echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
74 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
75 exit ;;
76 *:MirBSD:*:*)
77 - echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
78 + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
79 exit ;;
80 alpha:OSF1:*:*)
81 case $UNAME_RELEASE in
82 @@ -233,7 +224,7 @@
83 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
84 ;;
85 *5.*)
86 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
87 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
88 ;;
89 esac
90 # According to Compaq, /usr/sbin/psrinfo has been available on
91 @@ -279,7 +270,10 @@
92 # A Xn.n version is an unreleased experimental baselevel.
93 # 1.2 uses "1.2" for uname -r.
94 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
95 - exit ;;
96 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
97 + exitcode=$?
98 + trap '' 0
99 + exit $exitcode ;;
100 Alpha\ *:Windows_NT*:*)
101 # How do we know it's Interix rather than the generic POSIX subsystem?
102 # Should we change UNAME_MACHINE based on the output of uname instead
103 @@ -290,13 +284,13 @@
104 echo alpha-dec-winnt3.5
105 exit ;;
106 Amiga*:UNIX_System_V:4.0:*)
107 - echo m68k-${VENDOR}-sysv4
108 + echo m68k-unknown-sysv4
109 exit ;;
110 *:[Aa]miga[Oo][Ss]:*:*)
111 - echo ${UNAME_MACHINE}-${VENDOR}-amigaos
112 + echo ${UNAME_MACHINE}-unknown-amigaos
113 exit ;;
114 *:[Mm]orph[Oo][Ss]:*:*)
115 - echo ${UNAME_MACHINE}-${VENDOR}-morphos
116 + echo ${UNAME_MACHINE}-unknown-morphos
117 exit ;;
118 *:OS/390:*:*)
119 echo i370-ibm-openedition
120 @@ -305,13 +299,13 @@
121 echo s390-ibm-zvmoe
122 exit ;;
123 *:OS400:*:*)
124 - echo powerpc-ibm-os400
125 + echo powerpc-ibm-os400
126 exit ;;
127 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
128 echo arm-acorn-riscix${UNAME_RELEASE}
129 exit ;;
130 arm:riscos:*:*|arm:RISCOS:*:*)
131 - echo arm-${VENDOR}-riscos
132 + echo arm-unknown-riscos
133 exit ;;
134 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
135 echo hppa1.1-hitachi-hiuxmpp
136 @@ -404,23 +398,23 @@
137 # MiNT. But MiNT is downward compatible to TOS, so this should
138 # be no problem.
139 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
140 - echo m68k-atari-mint${UNAME_RELEASE}
141 + echo m68k-atari-mint${UNAME_RELEASE}
142 exit ;;
143 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
144 echo m68k-atari-mint${UNAME_RELEASE}
145 - exit ;;
146 + exit ;;
147 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
148 - echo m68k-atari-mint${UNAME_RELEASE}
149 + echo m68k-atari-mint${UNAME_RELEASE}
150 exit ;;
151 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
152 - echo m68k-milan-mint${UNAME_RELEASE}
153 - exit ;;
154 + echo m68k-milan-mint${UNAME_RELEASE}
155 + exit ;;
156 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
157 - echo m68k-hades-mint${UNAME_RELEASE}
158 - exit ;;
159 + echo m68k-hades-mint${UNAME_RELEASE}
160 + exit ;;
161 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
162 - echo m68k-${VENDOR}-mint${UNAME_RELEASE}
163 - exit ;;
164 + echo m68k-unknown-mint${UNAME_RELEASE}
165 + exit ;;
166 m68k:machten:*:*)
167 echo m68k-apple-machten${UNAME_RELEASE}
168 exit ;;
169 @@ -490,8 +484,8 @@
170 echo m88k-motorola-sysv3
171 exit ;;
172 AViiON:dgux:*:*)
173 - # DG/UX returns AViiON for all architectures
174 - UNAME_PROCESSOR=`/usr/bin/uname -p`
175 + # DG/UX returns AViiON for all architectures
176 + UNAME_PROCESSOR=`/usr/bin/uname -p`
177 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
178 then
179 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
180 @@ -504,7 +498,7 @@
181 else
182 echo i586-dg-dgux${UNAME_RELEASE}
183 fi
184 - exit ;;
185 + exit ;;
186 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
187 echo m88k-dolphin-sysv3
188 exit ;;
189 @@ -561,7 +555,7 @@
190 echo rs6000-ibm-aix3.2
191 fi
192 exit ;;
193 - *:AIX:*:[456])
194 + *:AIX:*:[4567])
195 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
196 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
197 IBM_ARCH=rs6000
198 @@ -604,52 +598,52 @@
199 9000/[678][0-9][0-9])
200 if [ -x /usr/bin/getconf ]; then
201 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
202 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
203 - case "${sc_cpu_version}" in
204 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
205 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
206 - 532) # CPU_PA_RISC2_0
207 - case "${sc_kernel_bits}" in
208 - 32) HP_ARCH="hppa2.0n" ;;
209 - 64) HP_ARCH="hppa2.0w" ;;
210 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
211 + case "${sc_cpu_version}" in
212 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
213 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
214 + 532) # CPU_PA_RISC2_0
215 + case "${sc_kernel_bits}" in
216 + 32) HP_ARCH="hppa2.0n" ;;
217 + 64) HP_ARCH="hppa2.0w" ;;
218 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
219 - esac ;;
220 - esac
221 + esac ;;
222 + esac
223 fi
224 if [ "${HP_ARCH}" = "" ]; then
225 eval $set_cc_for_build
226 - sed 's/^ //' << EOF >$dummy.c
227 + sed 's/^ //' << EOF >$dummy.c
229 - #define _HPUX_SOURCE
230 - #include <stdlib.h>
231 - #include <unistd.h>
232 -
233 - int main ()
234 - {
235 - #if defined(_SC_KERNEL_BITS)
236 - long bits = sysconf(_SC_KERNEL_BITS);
237 - #endif
238 - long cpu = sysconf (_SC_CPU_VERSION);
239 -
240 - switch (cpu)
241 - {
242 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
243 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
244 - case CPU_PA_RISC2_0:
245 - #if defined(_SC_KERNEL_BITS)
246 - switch (bits)
247 - {
248 - case 64: puts ("hppa2.0w"); break;
249 - case 32: puts ("hppa2.0n"); break;
250 - default: puts ("hppa2.0"); break;
251 - } break;
252 - #else /* !defined(_SC_KERNEL_BITS) */
253 - puts ("hppa2.0"); break;
254 - #endif
255 - default: puts ("hppa1.0"); break;
256 - }
257 - exit (0);
258 - }
259 + #define _HPUX_SOURCE
260 + #include <stdlib.h>
261 + #include <unistd.h>
262 +
263 + int main ()
264 + {
265 + #if defined(_SC_KERNEL_BITS)
266 + long bits = sysconf(_SC_KERNEL_BITS);
267 + #endif
268 + long cpu = sysconf (_SC_CPU_VERSION);
269 +
270 + switch (cpu)
271 + {
272 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
273 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
274 + case CPU_PA_RISC2_0:
275 + #if defined(_SC_KERNEL_BITS)
276 + switch (bits)
277 + {
278 + case 64: puts ("hppa2.0w"); break;
279 + case 32: puts ("hppa2.0n"); break;
280 + default: puts ("hppa2.0"); break;
281 + } break;
282 + #else /* !defined(_SC_KERNEL_BITS) */
283 + puts ("hppa2.0"); break;
284 + #endif
285 + default: puts ("hppa1.0"); break;
286 + }
287 + exit (0);
288 + }
289 EOF
290 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
291 test -z "$HP_ARCH" && HP_ARCH=hppa
292 @@ -730,9 +724,9 @@
293 exit ;;
294 i*86:OSF1:*:*)
295 if [ -x /usr/sbin/sysversion ] ; then
296 - echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
297 + echo ${UNAME_MACHINE}-unknown-osf1mk
298 else
299 - echo ${UNAME_MACHINE}-${VENDOR}-osf1
300 + echo ${UNAME_MACHINE}-unknown-osf1
301 fi
302 exit ;;
303 parisc*:Lites*:*:*)
304 @@ -740,22 +734,22 @@
305 exit ;;
306 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
307 echo c1-convex-bsd
308 - exit ;;
309 + exit ;;
310 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
311 if getsysinfo -f scalar_acc
312 then echo c32-convex-bsd
313 else echo c2-convex-bsd
314 fi
315 - exit ;;
316 + exit ;;
317 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
318 echo c34-convex-bsd
319 - exit ;;
320 + exit ;;
321 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
322 echo c38-convex-bsd
323 - exit ;;
324 + exit ;;
325 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
326 echo c4-convex-bsd
327 - exit ;;
328 + exit ;;
329 CRAY*Y-MP:*:*:*)
330 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
331 exit ;;
332 @@ -779,32 +773,32 @@
333 exit ;;
334 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
335 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
336 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
337 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
338 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
339 - exit ;;
340 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
341 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
342 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
343 + exit ;;
344 5000:UNIX_System_V:4.*:*)
345 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
346 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
347 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
348 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
349 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
350 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
351 exit ;;
352 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
353 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
354 exit ;;
355 sparc*:BSD/OS:*:*)
356 - echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
357 + echo sparc-unknown-bsdi${UNAME_RELEASE}
358 exit ;;
359 *:BSD/OS:*:*)
360 - echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
361 + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
362 exit ;;
363 *:FreeBSD:*:*)
364 case ${UNAME_MACHINE} in
365 pc98)
366 - echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
367 + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
368 amd64)
369 - echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
370 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
371 *)
372 - echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
373 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
374 esac
375 exit ;;
376 i*:CYGWIN*:*)
377 @@ -814,22 +808,22 @@
378 echo ${UNAME_MACHINE}-pc-mingw32
379 exit ;;
380 i*:windows32*:*)
381 - # uname -m includes "-pc" on this system.
382 - echo ${UNAME_MACHINE}-mingw32
383 + # uname -m includes "-pc" on this system.
384 + echo ${UNAME_MACHINE}-mingw32
385 exit ;;
386 i*:PW*:*)
387 echo ${UNAME_MACHINE}-pc-pw32
388 exit ;;
389 *:Interix*:*)
390 - case ${UNAME_MACHINE} in
391 + case ${UNAME_MACHINE} in
392 x86)
393 echo i586-pc-interix${UNAME_RELEASE}
394 exit ;;
395 authenticamd | genuineintel | EM64T)
396 - echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
397 + echo x86_64-unknown-interix${UNAME_RELEASE}
398 exit ;;
399 IA64)
400 - echo ia64-${VENDOR}-interix${UNAME_RELEASE}
401 + echo ia64-unknown-interix${UNAME_RELEASE}
402 exit ;;
403 esac ;;
404 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
405 @@ -848,21 +842,21 @@
406 echo ${UNAME_MACHINE}-pc-uwin
407 exit ;;
408 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
409 - echo x86_64-${VENDOR}-cygwin
410 + echo x86_64-unknown-cygwin
411 exit ;;
412 p*:CYGWIN*:*)
413 - echo powerpcle-${VENDOR}-cygwin
414 + echo powerpcle-unknown-cygwin
415 exit ;;
416 prep*:SunOS:5.*:*)
417 - echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
418 + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
419 exit ;;
420 *:GNU:*:*)
421 # the GNU system
422 - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
423 + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
424 exit ;;
425 *:GNU/*:*:*)
426 # other systems with GNU libc and userland
427 - echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
428 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
429 exit ;;
430 i*86:Minix:*:*)
431 echo ${UNAME_MACHINE}-pc-minix
432 @@ -876,23 +870,29 @@
433 EV6) UNAME_MACHINE=alphaev6 ;;
434 EV67) UNAME_MACHINE=alphaev67 ;;
435 EV68*) UNAME_MACHINE=alphaev68 ;;
436 - esac
437 + esac
438 objdump --private-headers /bin/sh | grep -q ld.so.1
439 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
440 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
441 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
442 exit ;;
443 arm*:Linux:*:*)
444 eval $set_cc_for_build
445 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
446 | grep -q __ARM_EABI__
447 then
448 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
449 + echo ${UNAME_MACHINE}-unknown-linux-gnu
450 else
451 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
452 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
453 + | grep -q __ARM_PCS_VFP
454 + then
455 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
456 + else
457 + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
458 + fi
459 fi
460 exit ;;
461 avr32*:Linux:*:*)
462 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
463 + echo ${UNAME_MACHINE}-unknown-linux-gnu
464 exit ;;
465 cris:Linux:*:*)
466 echo cris-axis-linux-gnu
467 @@ -901,7 +901,7 @@
468 echo crisv32-axis-linux-gnu
469 exit ;;
470 frv:Linux:*:*)
471 - echo frv-${VENDOR}-linux-gnu
472 + echo frv-unknown-linux-gnu
473 exit ;;
474 i*86:Linux:*:*)
475 LIBC=gnu
476 @@ -912,16 +912,16 @@
477 #endif
478 EOF
479 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
480 - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
481 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
482 exit ;;
483 ia64:Linux:*:*)
484 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
485 + echo ${UNAME_MACHINE}-unknown-linux-gnu
486 exit ;;
487 m32r*:Linux:*:*)
488 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
489 + echo ${UNAME_MACHINE}-unknown-linux-gnu
490 exit ;;
491 m68*:Linux:*:*)
492 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
493 + echo ${UNAME_MACHINE}-unknown-linux-gnu
494 exit ;;
495 mips:Linux:*:* | mips64:Linux:*:*)
496 eval $set_cc_for_build
497 @@ -940,51 +940,54 @@
498 #endif
499 EOF
500 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
501 - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
502 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
503 ;;
504 or32:Linux:*:*)
505 - echo or32-${VENDOR}-linux-gnu
506 + echo or32-unknown-linux-gnu
507 exit ;;
508 padre:Linux:*:*)
509 - echo sparc-${VENDOR}-linux-gnu
510 + echo sparc-unknown-linux-gnu
511 exit ;;
512 parisc64:Linux:*:* | hppa64:Linux:*:*)
513 - echo hppa64-${VENDOR}-linux-gnu
514 + echo hppa64-unknown-linux-gnu
515 exit ;;
516 parisc:Linux:*:* | hppa:Linux:*:*)
517 # Look for CPU level
518 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
519 - PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
520 - PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
521 - *) echo hppa-${VENDOR}-linux-gnu ;;
522 + PA7*) echo hppa1.1-unknown-linux-gnu ;;
523 + PA8*) echo hppa2.0-unknown-linux-gnu ;;
524 + *) echo hppa-unknown-linux-gnu ;;
525 esac
526 exit ;;
527 ppc64:Linux:*:*)
528 - echo powerpc64-${VENDOR}-linux-gnu
529 + echo powerpc64-unknown-linux-gnu
530 exit ;;
531 ppc:Linux:*:*)
532 - echo powerpc-${VENDOR}-linux-gnu
533 + echo powerpc-unknown-linux-gnu
534 exit ;;
535 s390:Linux:*:* | s390x:Linux:*:*)
536 echo ${UNAME_MACHINE}-ibm-linux
537 exit ;;
538 sh64*:Linux:*:*)
539 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
540 + echo ${UNAME_MACHINE}-unknown-linux-gnu
541 exit ;;
542 sh*:Linux:*:*)
543 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
544 + echo ${UNAME_MACHINE}-unknown-linux-gnu
545 exit ;;
546 sparc:Linux:*:* | sparc64:Linux:*:*)
547 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
548 + echo ${UNAME_MACHINE}-unknown-linux-gnu
549 + exit ;;
550 + tile*:Linux:*:*)
551 + echo ${UNAME_MACHINE}-tilera-linux-gnu
552 exit ;;
553 vax:Linux:*:*)
554 echo ${UNAME_MACHINE}-dec-linux-gnu
555 exit ;;
556 x86_64:Linux:*:*)
557 - echo x86_64-${VENDOR}-linux-gnu
558 + echo x86_64-unknown-linux-gnu
559 exit ;;
560 xtensa*:Linux:*:*)
561 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
562 + echo ${UNAME_MACHINE}-unknown-linux-gnu
563 exit ;;
564 i*86:DYNIX/ptx:4*:*)
565 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
566 @@ -993,11 +996,11 @@
567 echo i386-sequent-sysv4
568 exit ;;
569 i*86:UNIX_SV:4.2MP:2.*)
570 - # Unixware is an offshoot of SVR4, but it has its own version
571 - # number series starting with 2...
572 - # I am not positive that other SVR4 systems won't match this,
573 + # Unixware is an offshoot of SVR4, but it has its own version
574 + # number series starting with 2...
575 + # I am not positive that other SVR4 systems won't match this,
576 # I just have to hope. -- rms.
577 - # Use sysv4.2uw... so that sysv4* matches it.
578 + # Use sysv4.2uw... so that sysv4* matches it.
579 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
580 exit ;;
581 i*86:OS/2:*:*)
582 @@ -1006,16 +1009,16 @@
583 echo ${UNAME_MACHINE}-pc-os2-emx
584 exit ;;
585 i*86:XTS-300:*:STOP)
586 - echo ${UNAME_MACHINE}-${VENDOR}-stop
587 + echo ${UNAME_MACHINE}-unknown-stop
588 exit ;;
589 i*86:atheos:*:*)
590 - echo ${UNAME_MACHINE}-${VENDOR}-atheos
591 + echo ${UNAME_MACHINE}-unknown-atheos
592 exit ;;
593 i*86:syllable:*:*)
594 echo ${UNAME_MACHINE}-pc-syllable
595 exit ;;
596 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
597 - echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
598 + echo i386-unknown-lynxos${UNAME_RELEASE}
599 exit ;;
600 i*86:*DOS:*:*)
601 echo ${UNAME_MACHINE}-pc-msdosdjgpp
602 @@ -1029,13 +1032,13 @@
603 fi
604 exit ;;
605 i*86:*:5:[678]*)
606 - # UnixWare 7.x, OpenUNIX and OpenServer 6.
607 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
608 case `/bin/uname -X | grep "^Machine"` in
609 *486*) UNAME_MACHINE=i486 ;;
610 *Pentium) UNAME_MACHINE=i586 ;;
611 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
612 esac
613 - echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
614 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
615 exit ;;
616 i*86:*:3.2:*)
617 if test -f /usr/options/cb.name; then
618 @@ -1057,13 +1060,13 @@
619 exit ;;
620 pc:*:*:*)
621 # Left here for compatibility:
622 - # uname -m prints for DJGPP always 'pc', but it prints nothing about
623 - # the processor, so we play safe by assuming i586.
624 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
625 + # the processor, so we play safe by assuming i586.
626 # Note: whatever this is, it MUST be the same as what config.sub
627 # prints for the "djgpp" host, or else GDB configury will decide that
628 # this is a cross-build.
629 echo i586-pc-msdosdjgpp
630 - exit ;;
631 + exit ;;
632 Intel:Mach:3*:*)
633 echo i386-pc-mach3
634 exit ;;
635 @@ -1074,7 +1077,7 @@
636 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
637 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
638 else # Add other i860-SVR4 vendors below as they are discovered.
639 - echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
640 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
641 fi
642 exit ;;
643 mini*:CTIX:SYS*5:*)
644 @@ -1098,8 +1101,8 @@
645 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
646 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
647 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
648 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
649 - && { echo i486-ncr-sysv4; exit; } ;;
650 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
651 + && { echo i486-ncr-sysv4; exit; } ;;
652 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
653 OS_REL='.3'
654 test -r /etc/.relid \
655 @@ -1111,19 +1114,19 @@
656 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
657 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
658 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
659 - echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
660 + echo m68k-unknown-lynxos${UNAME_RELEASE}
661 exit ;;
662 mc68030:UNIX_System_V:4.*:*)
663 echo m68k-atari-sysv4
664 exit ;;
665 TSUNAMI:LynxOS:2.*:*)
666 - echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
667 + echo sparc-unknown-lynxos${UNAME_RELEASE}
668 exit ;;
669 rs6000:LynxOS:2.*:*)
670 - echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
671 + echo rs6000-unknown-lynxos${UNAME_RELEASE}
672 exit ;;
673 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
674 - echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
675 + echo powerpc-unknown-lynxos${UNAME_RELEASE}
676 exit ;;
677 SM[BE]S:UNIX_SV:*:*)
678 echo mips-dde-sysv${UNAME_RELEASE}
679 @@ -1142,10 +1145,10 @@
680 echo ns32k-sni-sysv
681 fi
682 exit ;;
683 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
684 - # says <Richard.M.Bartel@ccMail.Census.GOV>
685 - echo i586-unisys-sysv4
686 - exit ;;
687 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
688 + # says <Richard.M.Bartel@ccMail.Census.GOV>
689 + echo i586-unisys-sysv4
690 + exit ;;
691 *:UNIX_System_V:4*:FTX*)
692 # From Gerald Hewes <hewes@openmarket.com>.
693 # How about differentiating between stratus architectures? -djm
694 @@ -1171,11 +1174,11 @@
695 exit ;;
696 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
697 if [ -d /usr/nec ]; then
698 - echo mips-nec-sysv${UNAME_RELEASE}
699 + echo mips-nec-sysv${UNAME_RELEASE}
700 else
701 - echo mips-${VENDOR}-sysv${UNAME_RELEASE}
702 + echo mips-unknown-sysv${UNAME_RELEASE}
703 fi
704 - exit ;;
705 + exit ;;
706 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
707 echo powerpc-be-beos
708 exit ;;
709 @@ -1240,6 +1243,9 @@
710 *:QNX:*:4*)
711 echo i386-pc-qnx
712 exit ;;
713 + NEO-?:NONSTOP_KERNEL:*:*)
714 + echo neo-tandem-nsk${UNAME_RELEASE}
715 + exit ;;
716 NSE-?:NONSTOP_KERNEL:*:*)
717 echo nse-tandem-nsk${UNAME_RELEASE}
718 exit ;;
719 @@ -1264,13 +1270,13 @@
720 else
721 UNAME_MACHINE="$cputype"
722 fi
723 - echo ${UNAME_MACHINE}-${VENDOR}-plan9
724 + echo ${UNAME_MACHINE}-unknown-plan9
725 exit ;;
726 *:TOPS-10:*:*)
727 - echo pdp10-${VENDOR}-tops10
728 + echo pdp10-unknown-tops10
729 exit ;;
730 *:TENEX:*:*)
731 - echo pdp10-${VENDOR}-tenex
732 + echo pdp10-unknown-tenex
733 exit ;;
734 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
735 echo pdp10-dec-tops20
736 @@ -1279,19 +1285,19 @@
737 echo pdp10-xkl-tops20
738 exit ;;
739 *:TOPS-20:*:*)
740 - echo pdp10-${VENDOR}-tops20
741 + echo pdp10-unknown-tops20
742 exit ;;
743 *:ITS:*:*)
744 - echo pdp10-${VENDOR}-its
745 + echo pdp10-unknown-its
746 exit ;;
747 SEI:*:*:SEIUX)
748 - echo mips-sei-seiux${UNAME_RELEASE}
749 + echo mips-sei-seiux${UNAME_RELEASE}
750 exit ;;
751 *:DragonFly:*:*)
752 - echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
753 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
754 exit ;;
755 *:*VMS:*:*)
756 - UNAME_MACHINE=`(uname -p) 2>/dev/null`
757 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
758 case "${UNAME_MACHINE}" in
759 A*) echo alpha-dec-vms ; exit ;;
760 I*) echo ia64-dec-vms ; exit ;;
761 @@ -1331,11 +1337,11 @@
762 #include <sys/param.h>
763 printf ("m68k-sony-newsos%s\n",
764 #ifdef NEWSOS4
765 - "4"
766 + "4"
767 #else
768 - ""
769 + ""
770 #endif
771 - ); exit (0);
772 + ); exit (0);
773 #endif
774 #endif
776 diff -ru gnumeric-1.10.17.orig/config.sub gnumeric-1.10.17/config.sub
777 --- gnumeric-1.10.17.orig/config.sub 2011-07-07 13:40:02.000000000 +0200
778 +++ gnumeric-1.10.17/config.sub 2011-08-01 13:15:45.000000000 +0200
779 @@ -1,10 +1,10 @@
780 #! /bin/sh
781 # Configuration validation subroutine script.
782 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
783 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
784 -# Free Software Foundation, Inc.
785 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
786 +# 2011 Free Software Foundation, Inc.
788 -timestamp='2009-11-20'
789 +timestamp='2011-03-23'
791 # This file is (in principle) common to ALL GNU software.
792 # The presence of a machine in this file suggests that SOME GNU software
793 @@ -75,8 +75,9 @@
794 version="\
795 GNU config.sub ($timestamp)
797 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
798 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
799 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
800 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
801 +Software Foundation, Inc.
803 This is free software; see the source for copying conditions. There is NO
804 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
805 @@ -123,8 +124,9 @@
806 # Here we must recognize all the valid KERNEL-OS combinations.
807 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
808 case $maybe_os in
809 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
810 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
811 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
812 + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
813 + knetbsd*-gnu* | netbsd*-gnu* | \
814 kopensolaris*-gnu* | \
815 storm-chaos* | os2-emx* | rtmk-nova*)
816 os=-$maybe_os
817 @@ -156,8 +158,8 @@
818 os=
819 basic_machine=$1
820 ;;
821 - -bluegene*)
822 - os=-cnk
823 + -bluegene*)
824 + os=-cnk
825 ;;
826 -sim | -cisco | -oki | -wec | -winbond)
827 os=
828 @@ -173,10 +175,10 @@
829 os=-chorusos
830 basic_machine=$1
831 ;;
832 - -chorusrdb)
833 - os=-chorusrdb
834 + -chorusrdb)
835 + os=-chorusrdb
836 basic_machine=$1
837 - ;;
838 + ;;
839 -hiux*)
840 os=-hiuxwe2
841 ;;
842 @@ -281,11 +283,13 @@
843 | moxie \
844 | mt \
845 | msp430 \
846 + | nds32 | nds32le | nds32be \
847 | nios | nios2 \
848 | ns16k | ns32k \
849 + | open8 \
850 | or32 \
851 | pdp10 | pdp11 | pj | pjl \
852 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
853 + | powerpc | powerpc64 | powerpc64le | powerpcle \
854 | pyramid \
855 | rx \
856 | score \
857 @@ -293,15 +297,24 @@
858 | sh64 | sh64le \
859 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
860 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
861 - | spu | strongarm \
862 - | tahoe | thumb | tic4x | tic80 | tron \
863 + | spu \
864 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
865 | ubicom32 \
866 | v850 | v850e \
867 | we32k \
868 - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
869 + | x86 | xc16x | xstormy16 | xtensa \
870 | z8k | z80)
871 basic_machine=$basic_machine-unknown
872 ;;
873 + c54x)
874 + basic_machine=tic54x-unknown
875 + ;;
876 + c55x)
877 + basic_machine=tic55x-unknown
878 + ;;
879 + c6x)
880 + basic_machine=tic6x-unknown
881 + ;;
882 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
883 # Motorola 68HC11/12.
884 basic_machine=$basic_machine-unknown
885 @@ -313,6 +326,18 @@
886 basic_machine=mt-unknown
887 ;;
889 + strongarm | thumb | xscale)
890 + basic_machine=arm-unknown
891 + ;;
892 +
893 + xscaleeb)
894 + basic_machine=armeb-unknown
895 + ;;
896 +
897 + xscaleel)
898 + basic_machine=armel-unknown
899 + ;;
900 +
901 # We use `pc' rather than `unknown'
902 # because (1) that's what they normally are, and
903 # (2) the word "unknown" tends to confuse beginning users.
904 @@ -333,7 +358,7 @@
905 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
906 | avr-* | avr32-* \
907 | bfin-* | bs2000-* \
908 - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
909 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
910 | clipper-* | craynv-* | cydra-* \
911 | d10v-* | d30v-* | dlx-* \
912 | elxsi-* \
913 @@ -367,25 +392,28 @@
914 | mmix-* \
915 | mt-* \
916 | msp430-* \
917 + | nds32-* | nds32le-* | nds32be-* \
918 | nios-* | nios2-* \
919 | none-* | np1-* | ns16k-* | ns32k-* \
920 + | open8-* \
921 | orion-* \
922 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
923 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
924 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
925 | pyramid-* \
926 | romp-* | rs6000-* | rx-* \
927 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
928 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
929 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
930 | sparclite-* \
931 - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
932 - | tahoe-* | thumb-* \
933 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
934 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
935 + | tahoe-* \
936 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
937 + | tile-* | tilegx-* \
938 | tron-* \
939 | ubicom32-* \
940 | v850-* | v850e-* | vax-* \
941 | we32k-* \
942 - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
943 + | x86-* | x86_64-* | xc16x-* | xps100-* \
944 | xstormy16-* | xtensa*-* \
945 | ymp-* \
946 | z8k-* | z80-*)
947 @@ -410,7 +438,7 @@
948 basic_machine=a29k-amd
949 os=-udi
950 ;;
951 - abacus)
952 + abacus)
953 basic_machine=abacus-unknown
954 ;;
955 adobe68k)
956 @@ -480,11 +508,20 @@
957 basic_machine=powerpc-ibm
958 os=-cnk
959 ;;
960 + c54x-*)
961 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
962 + ;;
963 + c55x-*)
964 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
965 + ;;
966 + c6x-*)
967 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
968 + ;;
969 c90)
970 basic_machine=c90-cray
971 os=-unicos
972 ;;
973 - cegcc)
974 + cegcc)
975 basic_machine=arm-unknown
976 os=-cegcc
977 ;;
978 @@ -516,7 +553,7 @@
979 basic_machine=craynv-cray
980 os=-unicosmp
981 ;;
982 - cr16)
983 + cr16 | cr16-*)
984 basic_machine=cr16-unknown
985 os=-elf
986 ;;
987 @@ -732,7 +769,7 @@
988 basic_machine=ns32k-utek
989 os=-sysv
990 ;;
991 - microblaze)
992 + microblaze)
993 basic_machine=microblaze-xilinx
994 ;;
995 mingw32)
996 @@ -839,6 +876,12 @@
997 np1)
998 basic_machine=np1-gould
999 ;;
1000 + neo-tandem)
1001 + basic_machine=neo-tandem
1002 + ;;
1003 + nse-tandem)
1004 + basic_machine=nse-tandem
1005 + ;;
1006 nsr-tandem)
1007 basic_machine=nsr-tandem
1008 ;;
1009 @@ -921,9 +964,10 @@
1010 ;;
1011 power) basic_machine=power-ibm
1012 ;;
1013 - ppc) basic_machine=powerpc-unknown
1014 + ppc | ppcbe) basic_machine=powerpc-unknown
1015 ;;
1016 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1017 + ppc-* | ppcbe-*)
1018 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1019 ;;
1020 ppcle | powerpclittle | ppc-le | powerpc-little)
1021 basic_machine=powerpcle-unknown
1022 @@ -1017,6 +1061,9 @@
1023 basic_machine=i860-stratus
1024 os=-sysv4
1025 ;;
1026 + strongarm-* | thumb-*)
1027 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1028 + ;;
1029 sun2)
1030 basic_machine=m68000-sun
1031 ;;
1032 @@ -1073,17 +1120,10 @@
1033 basic_machine=t90-cray
1034 os=-unicos
1035 ;;
1036 - tic54x | c54x*)
1037 - basic_machine=tic54x-unknown
1038 - os=-coff
1039 - ;;
1040 - tic55x | c55x*)
1041 - basic_machine=tic55x-unknown
1042 - os=-coff
1043 - ;;
1044 - tic6x | c6x*)
1045 - basic_machine=tic6x-unknown
1046 - os=-coff
1047 + # This must be matched before tile*.
1048 + tilegx*)
1049 + basic_machine=tilegx-unknown
1050 + os=-linux-gnu
1051 ;;
1052 tile*)
1053 basic_machine=tile-unknown
1054 @@ -1156,6 +1196,9 @@
1055 xps | xps100)
1056 basic_machine=xps100-honeywell
1057 ;;
1058 + xscale-* | xscalee[bl]-*)
1059 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1060 + ;;
1061 ymp)
1062 basic_machine=ymp-cray
1063 os=-unicos
1064 @@ -1253,11 +1296,11 @@
1065 if [ x"$os" != x"" ]
1066 then
1067 case $os in
1068 - # First match some system type aliases
1069 - # that might get confused with valid system types.
1070 + # First match some system type aliases
1071 + # that might get confused with valid system types.
1072 # -solaris* is a basic system type, with this one exception.
1073 - -auroraux)
1074 - os=-auroraux
1075 + -auroraux)
1076 + os=-auroraux
1077 ;;
1078 -solaris1 | -solaris1.*)
1079 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1080 @@ -1294,7 +1337,8 @@
1081 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1082 | -chorusos* | -chorusrdb* | -cegcc* \
1083 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1084 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1085 + | -mingw32* | -linux-gnu* | -linux-android* \
1086 + | -linux-newlib* | -linux-uclibc* \
1087 | -uxpv* | -beos* | -mpeix* | -udk* \
1088 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1089 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1090 @@ -1341,7 +1385,7 @@
1091 -opened*)
1092 os=-openedition
1093 ;;
1094 - -os400*)
1095 + -os400*)
1096 os=-os400
1097 ;;
1098 -wince*)
1099 @@ -1390,7 +1434,7 @@
1100 -sinix*)
1101 os=-sysv4
1102 ;;
1103 - -tpf*)
1104 + -tpf*)
1105 os=-tpf
1106 ;;
1107 -triton*)
1108 @@ -1435,6 +1479,8 @@
1109 -dicos*)
1110 os=-dicos
1111 ;;
1112 + -nacl*)
1113 + ;;
1114 -none)
1115 ;;
1116 *)
1117 @@ -1457,10 +1503,10 @@
1118 # system, and we'll never get to this point.
1120 case $basic_machine in
1121 - score-*)
1122 + score-*)
1123 os=-elf
1124 ;;
1125 - spu-*)
1126 + spu-*)
1127 os=-elf
1128 ;;
1129 *-acorn)
1130 @@ -1472,8 +1518,17 @@
1131 arm*-semi)
1132 os=-aout
1133 ;;
1134 - c4x-* | tic4x-*)
1135 - os=-coff
1136 + c4x-* | tic4x-*)
1137 + os=-coff
1138 + ;;
1139 + tic54x-*)
1140 + os=-coff
1141 + ;;
1142 + tic55x-*)
1143 + os=-coff
1144 + ;;
1145 + tic6x-*)
1146 + os=-coff
1147 ;;
1148 # This must come before the *-dec entry.
1149 pdp10-*)
1150 @@ -1500,7 +1555,7 @@
1151 m68*-cisco)
1152 os=-aout
1153 ;;
1154 - mep-*)
1155 + mep-*)
1156 os=-elf
1157 ;;
1158 mips*-cisco)
1159 @@ -1527,7 +1582,7 @@
1160 *-ibm)
1161 os=-aix
1162 ;;
1163 - *-knuth)
1164 + *-knuth)
1165 os=-mmixware
1166 ;;
1167 *-wec)