1. gmapR
  2. src
  3. gstruct
  4. config
  5. config.sub
Browse code

update to latest GSTRUCT

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@123972 bc3139a8-67e5-0310-9ffc-ced21a209358

Michael Lawrence authored on 14/11/2016 21:54:30
Showing 1 changed files
src/gstruct/config/config.sub
History View file @ 55d77a1
... ... 
@@ -1,8 +1,8 @@
1 1 
 #! /bin/sh
2 2 
 # Configuration validation subroutine script.
3 
-#   Copyright 1992-2013 Free Software Foundation, Inc.
3 
+#   Copyright 1992-2014 Free Software Foundation, Inc.
4 4
5 
-timestamp='2013-04-24'
5 
+timestamp='2014-12-03'
6 6
7 7 
 # This file is free software; you can redistribute it and/or modify it
8 8 
 # under the terms of the GNU General Public License as published by
... ... 
@@ -25,7 +25,7 @@ timestamp='2013-04-24'
25 25 
 # of the GNU General Public License, version 3 ("GPLv3").
26 26
27 27
28 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
28 
+# Please send patches to <config-patches@gnu.org>.
29 29 
 #
30 30 
 # Configuration subroutine to validate and canonicalize a configuration type.
31 31 
 # Supply the specified configuration type as an argument.
... ... 
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
68 68 
 version="\
69 69 
 GNU config.sub ($timestamp)
70 70
71 
-Copyright 1992-2013 Free Software Foundation, Inc.
71 
+Copyright 1992-2014 Free Software Foundation, Inc.
72 72
73 73 
 This is free software; see the source for copying conditions.  There is NO
74 74 
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ... 
@@ -257,7 +257,7 @@ case $basic_machine in
257 257 
 	| avr | avr32 \
258 258 
 	| be32 | be64 \
259 259 
 	| bfin \
260 
-	| c4x | clipper \
260 
+	| c4x | c8051 | clipper \
261 261 
 	| d10v | d30v | dlx | dsp16xx \
262 262 
 	| epiphany \
263 263 
 	| fido | fr30 | frv \
... ... 
@@ -265,6 +265,7 @@ case $basic_machine in
265 265 
 	| hexagon \
266 266 
 	| i370 | i860 | i960 | ia64 \
267 267 
 	| ip2k | iq2000 \
268 
+	| k1om \
268 269 
 	| le32 | le64 \
269 270 
 	| lm32 \
270 271 
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
... ... 
@@ -282,8 +283,10 @@ case $basic_machine in
282 283 
 	| mips64vr5900 | mips64vr5900el \
283 284 
 	| mipsisa32 | mipsisa32el \
284 285 
 	| mipsisa32r2 | mipsisa32r2el \
286 
+	| mipsisa32r6 | mipsisa32r6el \
285 287 
 	| mipsisa64 | mipsisa64el \
286 288 
 	| mipsisa64r2 | mipsisa64r2el \
289 
+	| mipsisa64r6 | mipsisa64r6el \
287 290 
 	| mipsisa64sb1 | mipsisa64sb1el \
288 291 
 	| mipsisa64sr71k | mipsisa64sr71kel \
289 292 
 	| mipsr5900 | mipsr5900el \
... ... 
@@ -295,11 +298,11 @@ case $basic_machine in
295 298 
 	| nds32 | nds32le | nds32be \
296 299 
 	| nios | nios2 | nios2eb | nios2el \
297 300 
 	| ns16k | ns32k \
298 
-	| open8 \
299 
-	| or1k | or32 \
301 
+	| open8 | or1k | or1knd | or32 \
300 302 
 	| pdp10 | pdp11 | pj | pjl \
301 303 
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
302 304 
 	| pyramid \
305 
+	| riscv32 | riscv64 \
303 306 
 	| rl78 | rx \
304 307 
 	| score \
305 308 
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
... ... 
@@ -310,6 +313,7 @@ case $basic_machine in
310 313 
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
311 314 
 	| ubicom32 \
312 315 
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
316 
+	| visium \
313 317 
 	| we32k \
314 318 
 	| x86 | xc16x | xstormy16 | xtensa \
315 319 
 	| z8k | z80)
... ... 
@@ -324,7 +328,10 @@ case $basic_machine in
324 328 
 	c6x)
325 329 
 		basic_machine=tic6x-unknown
326 330 
 		;;
327 
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
331 
+	leon|leon[3-9])
332 
+		basic_machine=sparc-$basic_machine
333 
+		;;
334 
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
328 335 
 		basic_machine=$basic_machine-unknown
329 336 
 		os=-none
330 337 
 		;;
... ... 
@@ -372,7 +379,7 @@ case $basic_machine in
372 379 
 	| be32-* | be64-* \
373 380 
 	| bfin-* | bs2000-* \
374 381 
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
375 
-	| clipper-* | craynv-* | cydra-* \
382 
+	| c8051-* | clipper-* | craynv-* | cydra-* \
376 383 
 	| d10v-* | d30v-* | dlx-* \
377 384 
 	| elxsi-* \
378 385 
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
... ... 
@@ -381,6 +388,7 @@ case $basic_machine in
381 388 
 	| hexagon-* \
382 389 
 	| i*86-* | i860-* | i960-* | ia64-* \
383 390 
 	| ip2k-* | iq2000-* \
391 
+	| k1om-* \
384 392 
 	| le32-* | le64-* \
385 393 
 	| lm32-* \
386 394 
 	| m32c-* | m32r-* | m32rle-* \
... ... 
@@ -400,8 +408,10 @@ case $basic_machine in
400 408 
 	| mips64vr5900-* | mips64vr5900el-* \
401 409 
 	| mipsisa32-* | mipsisa32el-* \
402 410 
 	| mipsisa32r2-* | mipsisa32r2el-* \
411 
+	| mipsisa32r6-* | mipsisa32r6el-* \
403 412 
 	| mipsisa64-* | mipsisa64el-* \
404 413 
 	| mipsisa64r2-* | mipsisa64r2el-* \
414 
+	| mipsisa64r6-* | mipsisa64r6el-* \
405 415 
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
406 416 
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
407 417 
 	| mipsr5900-* | mipsr5900el-* \
... ... 
@@ -413,6 +423,7 @@ case $basic_machine in
413 423 
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
414 424 
 	| none-* | np1-* | ns16k-* | ns32k-* \
415 425 
 	| open8-* \
426 
+	| or1k*-* \
416 427 
 	| orion-* \
417 428 
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
418 429 
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
... ... 
@@ -430,6 +441,7 @@ case $basic_machine in
430 441 
 	| ubicom32-* \
431 442 
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
432 443 
 	| vax-* \
444 
+	| visium-* \
433 445 
 	| we32k-* \
434 446 
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
435 447 
 	| xstormy16-* | xtensa*-* \
... ... 
@@ -767,6 +779,9 @@ case $basic_machine in
767 779 
 		basic_machine=m68k-isi
768 780 
 		os=-sysv
769 781 
 		;;
782 
+	leon-*|leon[3-9]-*)
783 
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
784 
+		;;
770 785 
 	m68knommu)
771 786 
 		basic_machine=m68k-unknown
772 787 
 		os=-linux
... ... 
@@ -794,7 +809,7 @@ case $basic_machine in
794 809 
 		os=-mingw64
795 810 
 		;;
796 811 
 	mingw32)
797 
-		basic_machine=i386-pc
812 
+		basic_machine=i686-pc
798 813 
 		os=-mingw32
799 814 
 		;;
800 815 
 	mingw32ce)
... ... 
@@ -822,6 +837,10 @@ case $basic_machine in
822 837 
 		basic_machine=powerpc-unknown
823 838 
 		os=-morphos
824 839 
 		;;
840 
+	moxiebox)
841 
+		basic_machine=moxie-unknown
842 
+		os=-moxiebox
843 
+		;;
825 844 
 	msdos)
826 845 
 		basic_machine=i386-pc
827 846 
 		os=-msdos
... ... 
@@ -830,7 +849,7 @@ case $basic_machine in
830 849 
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
831 850 
 		;;
832 851 
 	msys)
833 
-		basic_machine=i386-pc
852 
+		basic_machine=i686-pc
834 853 
 		os=-msys
835 854 
 		;;
836 855 
 	mvs)
... ... 
@@ -1367,14 +1386,14 @@ case $os in
1367 1386 
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1368 1387 
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369 1388 
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1370 
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
1389 
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1371 1390 
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1372 1391 
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1373 1392 
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1374 1393 
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1375 1394 
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1376 1395 
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1377 
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1396 
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
1378 1397 
 	# Remember, each alternative MUST END IN *, to match a version number.
1379 1398 
 		;;
1380 1399 
 	-qnx*)
... ... 
@@ -1546,6 +1565,9 @@ case $basic_machine in
1546 1565 
 	c4x-* | tic4x-*)
1547 1566 
 		os=-coff
1548 1567 
 		;;
1568 
+	c8051-*)
1569 
+		os=-elf
1570 
+		;;
1549 1571 
 	hexagon-*)
1550 1572 
 		os=-elf
1551 1573 
 		;;
... ... 
@@ -1589,9 +1611,6 @@ case $basic_machine in
1589 1611 
 	mips*-*)
1590 1612 
 		os=-elf
1591 1613 
 		;;
1592 
-	or1k-*)
1593 
-		os=-elf
1594 
-		;;
1595 1614 
 	or32-*)
1596 1615 
 		os=-coff
1597 1616 
 		;;
Browse code

Update gstruct (bam_tally)

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@110046 bc3139a8-67e5-0310-9ffc-ced21a209358

Michael Lawrence authored on 28/10/2015 20:55:30
Showing 1 changed files
src/gstruct/config/config.sub
History View file @ f51bc89
... ... 
@@ -2,7 +2,7 @@
2 2 
 # Configuration validation subroutine script.
3 3 
 #   Copyright 1992-2013 Free Software Foundation, Inc.
4 4
5 
-timestamp='2013-08-10'
5 
+timestamp='2013-04-24'
6 6
7 7 
 # This file is free software; you can redistribute it and/or modify it
8 8 
 # under the terms of the GNU General Public License as published by
... ... 
@@ -257,7 +257,7 @@ case $basic_machine in
257 257 
 	| avr | avr32 \
258 258 
 	| be32 | be64 \
259 259 
 	| bfin \
260 
-	| c4x | c8051 | clipper \
260 
+	| c4x | clipper \
261 261 
 	| d10v | d30v | dlx | dsp16xx \
262 262 
 	| epiphany \
263 263 
 	| fido | fr30 | frv \
... ... 
@@ -372,7 +372,7 @@ case $basic_machine in
372 372 
 	| be32-* | be64-* \
373 373 
 	| bfin-* | bs2000-* \
374 374 
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
375 
-	| c8051-* | clipper-* | craynv-* | cydra-* \
375 
+	| clipper-* | craynv-* | cydra-* \
376 376 
 	| d10v-* | d30v-* | dlx-* \
377 377 
 	| elxsi-* \
378 378 
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
... ... 
@@ -794,7 +794,7 @@ case $basic_machine in
794 794 
 		os=-mingw64
795 795 
 		;;
796 796 
 	mingw32)
797 
-		basic_machine=i686-pc
797 
+		basic_machine=i386-pc
798 798 
 		os=-mingw32
799 799 
 		;;
800 800 
 	mingw32ce)
... ... 
@@ -830,7 +830,7 @@ case $basic_machine in
830 830 
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
831 831 
 		;;
832 832 
 	msys)
833 
-		basic_machine=i686-pc
833 
+		basic_machine=i386-pc
834 834 
 		os=-msys
835 835 
 		;;
836 836 
 	mvs)
... ... 
@@ -1546,9 +1546,6 @@ case $basic_machine in
1546 1546 
 	c4x-* | tic4x-*)
1547 1547 
 		os=-coff
1548 1548 
 		;;
1549 
-	c8051-*)
1550 
-		os=-elf
1551 
-		;;
1552 1549 
 	hexagon-*)
1553 1550 
 		os=-elf
1554 1551 
 		;;
Browse code

resurrect improvements that we reverted before the April release, expect breakage for a while

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@110039 bc3139a8-67e5-0310-9ffc-ced21a209358

Michael Lawrence authored on 28/10/2015 18:51:00
Showing 1 changed files
src/gstruct/config/config.sub
History View file @ 8418591
... ... 
@@ -1,44 +1,40 @@
1 1 
 #! /bin/sh
2 2 
 # Configuration validation subroutine script.
3 
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4 
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5 
-#   Free Software Foundation, Inc.
3 
+#   Copyright 1992-2013 Free Software Foundation, Inc.
6 4
7 
-timestamp='2008-01-16'
5 
+timestamp='2013-08-10'
8 6
9 
-# This file is (in principle) common to ALL GNU software.
10 
-# The presence of a machine in this file suggests that SOME GNU software
11 
-# can handle that machine.  It does not imply ALL GNU software can.
12 
-#
13 
-# This file is free software; you can redistribute it and/or modify
14 
-# it under the terms of the GNU General Public License as published by
15 
-# the Free Software Foundation; either version 2 of the License, or
7 
+# This file is free software; you can redistribute it and/or modify it
8 
+# under the terms of the GNU General Public License as published by
9 
+# the Free Software Foundation; either version 3 of the License, or
16 10 
 # (at your option) any later version.
17 11 
 #
18 
-# This program is distributed in the hope that it will be useful,
19 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
20 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 
-# GNU General Public License for more details.
12 
+# This program is distributed in the hope that it will be useful, but
13 
+# WITHOUT ANY WARRANTY; without even the implied warranty of
14 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15 
+# General Public License for more details.
22 16 
 #
23 17 
 # You should have received a copy of the GNU General Public License
24 
-# along with this program; if not, write to the Free Software
25 
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26 
-# 02110-1301, USA.
18 
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
27 19 
 #
28 20 
 # As a special exception to the GNU General Public License, if you
29 21 
 # distribute this file as part of a program that contains a
30 22 
 # configuration script generated by Autoconf, you may include it under
31 
-# the same distribution terms that you use for the rest of that program.
23 
+# the same distribution terms that you use for the rest of that
24 
+# program.  This Exception is an additional permission under section 7
25 
+# of the GNU General Public License, version 3 ("GPLv3").
32 26
33 27
34 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
35 
-# diff and a properly formatted ChangeLog entry.
28 
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
36 29 
 #
37 30 
 # Configuration subroutine to validate and canonicalize a configuration type.
38 31 
 # Supply the specified configuration type as an argument.
39 32 
 # If it is invalid, we print an error message on stderr and exit with code 1.
40 33 
 # Otherwise, we print the canonical config type on stdout and succeed.
41 34
35 
+# You can get the latest version of this script from:
36 
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
37 
+
42 38 
 # This file is supposed to be the same for all GNU packages
43 39 
 # and recognize all the CPU types, system types and aliases
44 40 
 # that are meaningful with *any* GNU software.
... ... 
@@ -72,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
72 68 
 version="\
73 69 
 GNU config.sub ($timestamp)
74 70
75 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76 
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
71 
+Copyright 1992-2013 Free Software Foundation, Inc.
77 72
78 73 
 This is free software; see the source for copying conditions.  There is NO
79 74 
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ... 
@@ -120,12 +115,18 @@ esac
120 115 
 # Here we must recognize all the valid KERNEL-OS combinations.
121 116 
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
122 117 
 case $maybe_os in
123 
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124 
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
118 
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
119 
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
120 
+  knetbsd*-gnu* | netbsd*-gnu* | \
121 
+  kopensolaris*-gnu* | \
125 122 
   storm-chaos* | os2-emx* | rtmk-nova*)
126 123 
     os=-$maybe_os
127 124 
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
128 125 
     ;;
126 
+  android-linux)
127 
+    os=-linux-android
128 
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
129 
+    ;;
129 130 
   *)
130 131 
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
131 132 
     if [ $basic_machine != $1 ]
... ... 
@@ -148,10 +149,13 @@ case $os in
148 149 
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149 150 
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150 151 
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151 
-	-apple | -axis | -knuth | -cray)
152 
+	-apple | -axis | -knuth | -cray | -microblaze*)
152 153 
 		os=
153 154 
 		basic_machine=$1
154 155 
 		;;
156 
+	-bluegene*)
157 
+		os=-cnk
158 
+		;;
155 159 
 	-sim | -cisco | -oki | -wec | -winbond)
156 160 
 		os=
157 161 
 		basic_machine=$1
... ... 
@@ -166,10 +170,10 @@ case $os in
166 170 
 		os=-chorusos
167 171 
 		basic_machine=$1
168 172 
 		;;
169 
- 	-chorusrdb)
170 
- 		os=-chorusrdb
173 
+	-chorusrdb)
174 
+		os=-chorusrdb
171 175 
 		basic_machine=$1
172 
- 		;;
176 
+		;;
173 177 
 	-hiux*)
174 178 
 		os=-hiuxwe2
175 179 
 		;;
... ... 
@@ -214,6 +218,12 @@ case $os in
214 218 
 	-isc*)
215 219 
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
216 220 
 		;;
221 
+	-lynx*178)
222 
+		os=-lynxos178
223 
+		;;
224 
+	-lynx*5)
225 
+		os=-lynxos5
226 
+		;;
217 227 
 	-lynx*)
218 228 
 		os=-lynxos
219 229 
 		;;
... ... 
@@ -238,24 +248,34 @@ case $basic_machine in
238 248 
 	# Some are omitted here because they have special meanings below.
239 249 
 	1750a | 580 \
240 250 
 	| a29k \
251 
+	| aarch64 | aarch64_be \
241 252 
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
242 253 
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
243 254 
 	| am33_2.0 \
244 
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
255 
+	| arc | arceb \
256 
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257 
+	| avr | avr32 \
258 
+	| be32 | be64 \
245 259 
 	| bfin \
246 
-	| c4x | clipper \
260 
+	| c4x | c8051 | clipper \
247 261 
 	| d10v | d30v | dlx | dsp16xx \
262 
+	| epiphany \
248 263 
 	| fido | fr30 | frv \
249 264 
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265 
+	| hexagon \
250 266 
 	| i370 | i860 | i960 | ia64 \
251 267 
 	| ip2k | iq2000 \
268 
+	| le32 | le64 \
269 
+	| lm32 \
252 270 
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
253 
-	| maxq | mb | microblaze | mcore | mep \
271 
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
254 272 
 	| mips | mipsbe | mipseb | mipsel | mipsle \
255 273 
 	| mips16 \
256 274 
 	| mips64 | mips64el \
257 
-	| mips64vr | mips64vrel \
275 
+	| mips64octeon | mips64octeonel \
258 276 
 	| mips64orion | mips64orionel \
277 
+	| mips64r5900 | mips64r5900el \
278 
+	| mips64vr | mips64vrel \
259 279 
 	| mips64vr4100 | mips64vr4100el \
260 280 
 	| mips64vr4300 | mips64vr4300el \
261 281 
 	| mips64vr5000 | mips64vr5000el \
... ... 
@@ -266,31 +286,45 @@ case $basic_machine in
266 286 
 	| mipsisa64r2 | mipsisa64r2el \
267 287 
 	| mipsisa64sb1 | mipsisa64sb1el \
268 288 
 	| mipsisa64sr71k | mipsisa64sr71kel \
289 
+	| mipsr5900 | mipsr5900el \
269 290 
 	| mipstx39 | mipstx39el \
270 291 
 	| mn10200 | mn10300 \
292 
+	| moxie \
271 293 
 	| mt \
272 294 
 	| msp430 \
273 
-	| nios | nios2 \
295 
+	| nds32 | nds32le | nds32be \
296 
+	| nios | nios2 | nios2eb | nios2el \
274 297 
 	| ns16k | ns32k \
275 
-	| or32 \
298 
+	| open8 \
299 
+	| or1k | or32 \
276 300 
 	| pdp10 | pdp11 | pj | pjl \
277 
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
301 
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
278 302 
 	| pyramid \
303 
+	| rl78 | rx \
279 304 
 	| score \
280 
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
305 
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
281 306 
 	| sh64 | sh64le \
282 307 
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
283 308 
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
284 
-	| spu | strongarm \
285 
-	| tahoe | thumb | tic4x | tic80 | tron \
286 
-	| v850 | v850e \
309 
+	| spu \
310 
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
311 
+	| ubicom32 \
312 
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
287 313 
 	| we32k \
288 
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
289 
-	| z8k)
314 
+	| x86 | xc16x | xstormy16 | xtensa \
315 
+	| z8k | z80)
290 316 
 		basic_machine=$basic_machine-unknown
291 317 
 		;;
292 
-	m6811 | m68hc11 | m6812 | m68hc12)
293 
-		# Motorola 68HC11/12.
318 
+	c54x)
319 
+		basic_machine=tic54x-unknown
320 
+		;;
321 
+	c55x)
322 
+		basic_machine=tic55x-unknown
323 
+		;;
324 
+	c6x)
325 
+		basic_machine=tic6x-unknown
326 
+		;;
327 
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
294 328 
 		basic_machine=$basic_machine-unknown
295 329 
 		os=-none
296 330 
 		;;
... ... 
@@ -300,6 +334,21 @@ case $basic_machine in
300 334 
 		basic_machine=mt-unknown
301 335 
 		;;
302 336
337 
+	strongarm | thumb | xscale)
338 
+		basic_machine=arm-unknown
339 
+		;;
340 
+	xgate)
341 
+		basic_machine=$basic_machine-unknown
342 
+		os=-none
343 
+		;;
344 
+	xscaleeb)
345 
+		basic_machine=armeb-unknown
346 
+		;;
347 
+
348 
+	xscaleel)
349 
+		basic_machine=armel-unknown
350 
+		;;
351 
+
303 352 
 	# We use `pc' rather than `unknown'
304 353 
 	# because (1) that's what they normally are, and
305 354 
 	# (2) the word "unknown" tends to confuse beginning users.
... ... 
@@ -314,29 +363,37 @@ case $basic_machine in
314 363 
 	# Recognize the basic CPU types with company name.
315 364 
 	580-* \
316 365 
 	| a29k-* \
366 
+	| aarch64-* | aarch64_be-* \
317 367 
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
318 368 
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
319 
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
369 
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
320 370 
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
321 371 
 	| avr-* | avr32-* \
372 
+	| be32-* | be64-* \
322 373 
 	| bfin-* | bs2000-* \
323 
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
324 
-	| clipper-* | craynv-* | cydra-* \
374 
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
375 
+	| c8051-* | clipper-* | craynv-* | cydra-* \
325 376 
 	| d10v-* | d30v-* | dlx-* \
326 377 
 	| elxsi-* \
327 378 
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
328 379 
 	| h8300-* | h8500-* \
329 380 
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
381 
+	| hexagon-* \
330 382 
 	| i*86-* | i860-* | i960-* | ia64-* \
331 383 
 	| ip2k-* | iq2000-* \
384 
+	| le32-* | le64-* \
385 
+	| lm32-* \
332 386 
 	| m32c-* | m32r-* | m32rle-* \
333 387 
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
334 
-	| m88110-* | m88k-* | maxq-* | mcore-* \
388 
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
389 
+	| microblaze-* | microblazeel-* \
335 390 
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
336 391 
 	| mips16-* \
337 392 
 	| mips64-* | mips64el-* \
338 
-	| mips64vr-* | mips64vrel-* \
393 
+	| mips64octeon-* | mips64octeonel-* \
339 394 
 	| mips64orion-* | mips64orionel-* \
395 
+	| mips64r5900-* | mips64r5900el-* \
396 
+	| mips64vr-* | mips64vrel-* \
340 397 
 	| mips64vr4100-* | mips64vr4100el-* \
341 398 
 	| mips64vr4300-* | mips64vr4300el-* \
342 399 
 	| mips64vr5000-* | mips64vr5000el-* \
... ... 
@@ -347,31 +404,37 @@ case $basic_machine in
347 404 
 	| mipsisa64r2-* | mipsisa64r2el-* \
348 405 
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
349 406 
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
407 
+	| mipsr5900-* | mipsr5900el-* \
350 408 
 	| mipstx39-* | mipstx39el-* \
351 409 
 	| mmix-* \
352 410 
 	| mt-* \
353 411 
 	| msp430-* \
354 
-	| nios-* | nios2-* \
412 
+	| nds32-* | nds32le-* | nds32be-* \
413 
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
355 414 
 	| none-* | np1-* | ns16k-* | ns32k-* \
415 
+	| open8-* \
356 416 
 	| orion-* \
357 417 
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
358 
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
418 
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
359 419 
 	| pyramid-* \
360 
-	| romp-* | rs6000-* \
361 
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
420 
+	| rl78-* | romp-* | rs6000-* | rx-* \
421 
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
362 422 
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
363 423 
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
364 424 
 	| sparclite-* \
365 
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
366 
-	| tahoe-* | thumb-* \
425 
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
426 
+	| tahoe-* \
367 427 
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
428 
+	| tile*-* \
368 429 
 	| tron-* \
369 
-	| v850-* | v850e-* | vax-* \
430 
+	| ubicom32-* \
431 
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
432 
+	| vax-* \
370 433 
 	| we32k-* \
371 
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
434 
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
372 435 
 	| xstormy16-* | xtensa*-* \
373 436 
 	| ymp-* \
374 
-	| z8k-*)
437 
+	| z8k-* | z80-*)
375 438 
 		;;
376 439 
 	# Recognize the basic CPU types without company name, with glob match.
377 440 
 	xtensa*)
... ... 
@@ -393,7 +456,7 @@ case $basic_machine in
393 456 
 		basic_machine=a29k-amd
394 457 
 		os=-udi
395 458 
 		;;
396 
-    	abacus)
459 
+	abacus)
397 460 
 		basic_machine=abacus-unknown
398 461 
 		;;
399 462 
 	adobe68k)
... ... 
@@ -439,6 +502,10 @@ case $basic_machine in
439 502 
 		basic_machine=m68k-apollo
440 503 
 		os=-bsd
441 504 
 		;;
505 
+	aros)
506 
+		basic_machine=i386-pc
507 
+		os=-aros
508 
+		;;
442 509 
 	aux)
443 510 
 		basic_machine=m68k-apple
444 511 
 		os=-aux
... ... 
@@ -455,10 +522,27 @@ case $basic_machine in
455 522 
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
456 523 
 		os=-linux
457 524 
 		;;
525 
+	bluegene*)
526 
+		basic_machine=powerpc-ibm
527 
+		os=-cnk
528 
+		;;
529 
+	c54x-*)
530 
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
531 
+		;;
532 
+	c55x-*)
533 
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
534 
+		;;
535 
+	c6x-*)
536 
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
537 
+		;;
458 538 
 	c90)
459 539 
 		basic_machine=c90-cray
460 540 
 		os=-unicos
461 541 
 		;;
542 
+	cegcc)
543 
+		basic_machine=arm-unknown
544 
+		os=-cegcc
545 
+		;;
462 546 
 	convex-c1)
463 547 
 		basic_machine=c1-convex
464 548 
 		os=-bsd
... ... 
@@ -487,7 +571,7 @@ case $basic_machine in
487 571 
 		basic_machine=craynv-cray
488 572 
 		os=-unicosmp
489 573 
 		;;
490 
-	cr16)
574 
+	cr16 | cr16-*)
491 575 
 		basic_machine=cr16-unknown
492 576 
 		os=-elf
493 577 
 		;;
... ... 
@@ -526,6 +610,10 @@ case $basic_machine in
526 610 
 		basic_machine=m88k-motorola
527 611 
 		os=-sysv3
528 612 
 		;;
613 
+	dicos)
614 
+		basic_machine=i686-pc
615 
+		os=-dicos
616 
+		;;
529 617 
 	djgpp)
530 618 
 		basic_machine=i586-pc
531 619 
 		os=-msdosdjgpp
... ... 
@@ -641,7 +729,6 @@ case $basic_machine in
641 729 
 	i370-ibm* | ibm*)
642 730 
 		basic_machine=i370-ibm
643 731 
 		;;
644 
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
645 732 
 	i*86v32)
646 733 
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
647 734 
 		os=-sysv32
... ... 
@@ -699,8 +786,15 @@ case $basic_machine in
699 786 
 		basic_machine=ns32k-utek
700 787 
 		os=-sysv
701 788 
 		;;
789 
+	microblaze*)
790 
+		basic_machine=microblaze-xilinx
791 
+		;;
792 
+	mingw64)
793 
+		basic_machine=x86_64-pc
794 
+		os=-mingw64
795 
+		;;
702 796 
 	mingw32)
703 
-		basic_machine=i386-pc
797 
+		basic_machine=i686-pc
704 798 
 		os=-mingw32
705 799 
 		;;
706 800 
 	mingw32ce)
... ... 
@@ -735,10 +829,18 @@ case $basic_machine in
735 829 
 	ms1-*)
736 830 
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
737 831 
 		;;
832 
+	msys)
833 
+		basic_machine=i686-pc
834 
+		os=-msys
835 
+		;;
738 836 
 	mvs)
739 837 
 		basic_machine=i370-ibm
740 838 
 		os=-mvs
741 839 
 		;;
840 
+	nacl)
841 
+		basic_machine=le32-unknown
842 
+		os=-nacl
843 
+		;;
742 844 
 	ncr3000)
743 845 
 		basic_machine=i486-ncr
744 846 
 		os=-sysv4
... ... 
@@ -803,6 +905,12 @@ case $basic_machine in
803 905 
 	np1)
804 906 
 		basic_machine=np1-gould
805 907 
 		;;
908 
+	neo-tandem)
909 
+		basic_machine=neo-tandem
910 
+		;;
911 
+	nse-tandem)
912 
+		basic_machine=nse-tandem
913 
+		;;
806 914 
 	nsr-tandem)
807 915 
 		basic_machine=nsr-tandem
808 916 
 		;;
... ... 
@@ -885,9 +993,10 @@ case $basic_machine in
885 993 
 		;;
886 994 
 	power)	basic_machine=power-ibm
887 995 
 		;;
888 
-	ppc)	basic_machine=powerpc-unknown
996 
+	ppc | ppcbe)	basic_machine=powerpc-unknown
889 997 
 		;;
890 
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
998 
+	ppc-* | ppcbe-*)
999 
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
891 1000 
 		;;
892 1001 
 	ppcle | powerpclittle | ppc-le | powerpc-little)
893 1002 
 		basic_machine=powerpcle-unknown
... ... 
@@ -912,7 +1021,11 @@ case $basic_machine in
912 1021 
 		basic_machine=i586-unknown
913 1022 
 		os=-pw32
914 1023 
 		;;
915 
-	rdos)
1024 
+	rdos | rdos64)
1025 
+		basic_machine=x86_64-pc
1026 
+		os=-rdos
1027 
+		;;
1028 
+	rdos32)
916 1029 
 		basic_machine=i386-pc
917 1030 
 		os=-rdos
918 1031 
 		;;
... ... 
@@ -981,6 +1094,9 @@ case $basic_machine in
981 1094 
 		basic_machine=i860-stratus
982 1095 
 		os=-sysv4
983 1096 
 		;;
1097 
+	strongarm-* | thumb-*)
1098 
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1099 
+		;;
984 1100 
 	sun2)
985 1101 
 		basic_machine=m68000-sun
986 1102 
 		;;
... ... 
@@ -1037,20 +1153,8 @@ case $basic_machine in
1037 1153 
 		basic_machine=t90-cray
1038 1154 
 		os=-unicos
1039 1155 
 		;;
1040 
-	tic54x | c54x*)
1041 
-		basic_machine=tic54x-unknown
1042 
-		os=-coff
1043 
-		;;
1044 
-	tic55x | c55x*)
1045 
-		basic_machine=tic55x-unknown
1046 
-		os=-coff
1047 
-		;;
1048 
-	tic6x | c6x*)
1049 
-		basic_machine=tic6x-unknown
1050 
-		os=-coff
1051 
-		;;
1052 1156 
 	tile*)
1053 
-		basic_machine=tile-unknown
1157 
+		basic_machine=$basic_machine-unknown
1054 1158 
 		os=-linux-gnu
1055 1159 
 		;;
1056 1160 
 	tx39)
... ... 
@@ -1120,6 +1224,9 @@ case $basic_machine in
1120 1224 
 	xps | xps100)
1121 1225 
 		basic_machine=xps100-honeywell
1122 1226 
 		;;
1227 
+	xscale-* | xscalee[bl]-*)
1228 
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1229 
+		;;
1123 1230 
 	ymp)
1124 1231 
 		basic_machine=ymp-cray
1125 1232 
 		os=-unicos
... ... 
@@ -1128,6 +1235,10 @@ case $basic_machine in
1128 1235 
 		basic_machine=z8k-unknown
1129 1236 
 		os=-sim
1130 1237 
 		;;
1238 
+	z80-*-coff)
1239 
+		basic_machine=z80-unknown
1240 
+		os=-sim
1241 
+		;;
1131 1242 
 	none)
1132 1243 
 		basic_machine=none-none
1133 1244 
 		os=-none
... ... 
@@ -1166,7 +1277,7 @@ case $basic_machine in
1166 1277 
 	we32k)
1167 1278 
 		basic_machine=we32k-att
1168 1279 
 		;;
1169 
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1280 
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1170 1281 
 		basic_machine=sh-unknown
1171 1282 
 		;;
1172 1283 
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
... ... 
@@ -1213,9 +1324,12 @@ esac
1213 1324 
 if [ x"$os" != x"" ]
1214 1325 
 then
1215 1326 
 case $os in
1216 
-        # First match some system type aliases
1217 
-        # that might get confused with valid system types.
1327 
+	# First match some system type aliases
1328 
+	# that might get confused with valid system types.
1218 1329 
 	# -solaris* is a basic system type, with this one exception.
1330 
+	-auroraux)
1331 
+		os=-auroraux
1332 
+		;;
1219 1333 
 	-solaris1 | -solaris1.*)
1220 1334 
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
1221 1335 
 		;;
... ... 
@@ -1236,21 +1350,23 @@ case $os in
1236 1350 
 	# Each alternative MUST END IN A *, to match a version number.
1237 1351 
 	# -sysv* is not here because it comes later, after sysvr4.
1238 1352 
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1239 
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1240 
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1353 
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1354 
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1355 
+	      | -sym* | -kopensolaris* | -plan9* \
1241 1356 
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1242 
-	      | -aos* \
1357 
+	      | -aos* | -aros* \
1243 1358 
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1244 1359 
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1245 1360 
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1246 
-	      | -openbsd* | -solidbsd* \
1361 
+	      | -bitrig* | -openbsd* | -solidbsd* \
1247 1362 
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1248 1363 
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1249 1364 
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1250 1365 
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1251 
-	      | -chorusos* | -chorusrdb* \
1252 
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1253 
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1366 
+	      | -chorusos* | -chorusrdb* | -cegcc* \
1367 
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1368 
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369 
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1254 1370 
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
1255 1371 
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1256 1372 
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
... ... 
@@ -1258,7 +1374,7 @@ case $os in
1258 1374 
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1259 1375 
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1260 1376 
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1261 
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1377 
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1262 1378 
 	# Remember, each alternative MUST END IN *, to match a version number.
1263 1379 
 		;;
1264 1380 
 	-qnx*)
... ... 
@@ -1297,7 +1413,7 @@ case $os in
1297 1413 
 	-opened*)
1298 1414 
 		os=-openedition
1299 1415 
 		;;
1300 
-        -os400*)
1416 
+	-os400*)
1301 1417 
 		os=-os400
1302 1418 
 		;;
1303 1419 
 	-wince*)
... ... 
@@ -1346,7 +1462,7 @@ case $os in
1346 1462 
 	-sinix*)
1347 1463 
 		os=-sysv4
1348 1464 
 		;;
1349 
-        -tpf*)
1465 
+	-tpf*)
1350 1466 
 		os=-tpf
1351 1467 
 		;;
1352 1468 
 	-triton*)
... ... 
@@ -1382,12 +1498,14 @@ case $os in
1382 1498 
 	-aros*)
1383 1499 
 		os=-aros
1384 1500 
 		;;
1385 
-	-kaos*)
1386 
-		os=-kaos
1387 
-		;;
1388 1501 
 	-zvmoe)
1389 1502 
 		os=-zvmoe
1390 1503 
 		;;
1504 
+	-dicos*)
1505 
+		os=-dicos
1506 
+		;;
1507 
+	-nacl*)
1508 
+		;;
1391 1509 
 	-none)
1392 1510 
 		;;
1393 1511 
 	*)
... ... 
@@ -1410,10 +1528,10 @@ else
1410 1528 
 # system, and we'll never get to this point.
1411 1529
1412 1530 
 case $basic_machine in
1413 
-        score-*)
1531 
+	score-*)
1414 1532 
 		os=-elf
1415 1533 
 		;;
1416 
-        spu-*)
1534 
+	spu-*)
1417 1535 
 		os=-elf
1418