~ubuntu-branches/ubuntu/precise/torque/precise-security

« back to all changes in this revision

Viewing changes to buildutils/config.sub

  • Committer: Bazaar Package Importer
  • Author(s): Jordi Mallach
  • Date: 2010-06-15 10:25:46 UTC
  • mfrom: (0.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100615102546-two40e2cqxdthra4
Tags: 2.4.8+dfsg-7
* Fix paths on "non-standard-dir-perm" overrides.
* Make torque-server Conflict: torque-client (<= 2.4), and
  torque-client-x11 Replace: torque-gui, for smoother upgrade path
  from the Ubuntu packages.
* Explicitly enable RPP.
* Pass --with-rcp=scp so Torque uses scp as remote copy command.
* Build-Depend on openssh-client.
* Add gnu_fixes.patch, disabled for now, to fix builds on the Hurd.
  This patch is a temporary hack. As it is now, the package will build,
  but will most probably not work. The correct fix is to disable quota
  support on this platform.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#! /bin/sh
2
2
# Configuration validation subroutine script.
3
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
 
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
 
#   Free Software Foundation, Inc.
 
4
#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
6
5
 
7
 
timestamp='2010-01-22'
 
6
timestamp='2005-07-08'
8
7
 
9
8
# This file is (in principle) common to ALL GNU software.
10
9
# The presence of a machine in this file suggests that SOME GNU software
32
31
 
33
32
 
34
33
# Please send patches to <config-patches@gnu.org>.  Submit a context
35
 
# diff and a properly formatted GNU ChangeLog entry.
 
34
# diff and a properly formatted ChangeLog entry.
36
35
#
37
36
# Configuration subroutine to validate and canonicalize a configuration type.
38
37
# Supply the specified configuration type as an argument.
39
38
# If it is invalid, we print an error message on stderr and exit with code 1.
40
39
# Otherwise, we print the canonical config type on stdout and succeed.
41
40
 
42
 
# You can get the latest version of this script from:
43
 
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
 
 
45
41
# This file is supposed to be the same for all GNU packages
46
42
# and recognize all the CPU types, system types and aliases
47
43
# that are meaningful with *any* GNU software.
75
71
version="\
76
72
GNU config.sub ($timestamp)
77
73
 
78
 
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
79
 
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
80
 
Software Foundation, Inc.
 
74
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 
75
Free Software Foundation, Inc.
81
76
 
82
77
This is free software; see the source for copying conditions.  There is NO
83
78
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
124
119
# Here we must recognize all the valid KERNEL-OS combinations.
125
120
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
126
121
case $maybe_os in
127
 
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
128
 
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
129
 
  kopensolaris*-gnu* | \
130
 
  storm-chaos* | os2-emx* | rtmk-nova*)
 
122
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
 
123
  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
131
124
    os=-$maybe_os
132
125
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
133
126
    ;;
153
146
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
154
147
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
155
148
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
156
 
        -apple | -axis | -knuth | -cray | -microblaze)
 
149
        -apple | -axis | -knuth | -cray)
157
150
                os=
158
151
                basic_machine=$1
159
152
                ;;
160
 
        -bluegene*)
161
 
                os=-cnk
162
 
                ;;
163
153
        -sim | -cisco | -oki | -wec | -winbond)
164
154
                os=
165
155
                basic_machine=$1
181
171
        -hiux*)
182
172
                os=-hiuxwe2
183
173
                ;;
184
 
        -sco6)
185
 
                os=-sco5v6
186
 
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
187
 
                ;;
188
174
        -sco5)
189
175
                os=-sco3.2v5
190
176
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
201
187
                # Don't forget version if it is 3.2v4 or newer.
202
188
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
203
189
                ;;
204
 
        -sco5v6*)
205
 
                # Don't forget version if it is 3.2v4 or newer.
206
 
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
207
 
                ;;
208
190
        -sco*)
209
191
                os=-sco3.2v2
210
192
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
249
231
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
250
232
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
251
233
        | am33_2.0 \
252
 
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 
234
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
253
235
        | bfin \
254
236
        | c4x | clipper \
255
237
        | d10v | d30v | dlx | dsp16xx \
256
 
        | fido | fr30 | frv \
 
238
        | fr30 | frv \
257
239
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
258
240
        | i370 | i860 | i960 | ia64 \
259
241
        | ip2k | iq2000 \
260
 
        | lm32 \
261
 
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
262
 
        | maxq | mb | microblaze | mcore | mep | metag \
 
242
        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
263
243
        | mips | mipsbe | mipseb | mipsel | mipsle \
264
244
        | mips16 \
265
245
        | mips64 | mips64el \
266
 
        | mips64octeon | mips64octeonel \
 
246
        | mips64vr | mips64vrel \
267
247
        | mips64orion | mips64orionel \
268
 
        | mips64r5900 | mips64r5900el \
269
 
        | mips64vr | mips64vrel \
270
248
        | mips64vr4100 | mips64vr4100el \
271
249
        | mips64vr4300 | mips64vr4300el \
272
250
        | mips64vr5000 | mips64vr5000el \
279
257
        | mipsisa64sr71k | mipsisa64sr71kel \
280
258
        | mipstx39 | mipstx39el \
281
259
        | mn10200 | mn10300 \
282
 
        | moxie \
283
 
        | mt \
 
260
        | ms1 \
284
261
        | msp430 \
285
 
        | nios | nios2 \
286
262
        | ns16k | ns32k \
287
263
        | or32 \
288
264
        | pdp10 | pdp11 | pj | pjl \
289
265
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
290
266
        | pyramid \
291
 
        | rx \
292
 
        | score \
293
 
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 
267
        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
294
268
        | sh64 | sh64le \
295
 
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
296
 
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
297
 
        | spu | strongarm \
 
269
        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
 
270
        | sparcv8 | sparcv9 | sparcv9b \
 
271
        | strongarm \
298
272
        | tahoe | thumb | tic4x | tic80 | tron \
299
 
        | ubicom32 \
300
273
        | v850 | v850e \
301
274
        | we32k \
302
 
        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
303
 
        | z8k | z80)
304
 
                basic_machine=$basic_machine-unknown
305
 
                ;;
306
 
        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 
275
        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 
276
        | z8k)
 
277
                basic_machine=$basic_machine-unknown
 
278
                ;;
 
279
        m32c)
 
280
                basic_machine=$basic_machine-unknown
 
281
                ;;
 
282
        m6811 | m68hc11 | m6812 | m68hc12)
307
283
                # Motorola 68HC11/12.
308
284
                basic_machine=$basic_machine-unknown
309
285
                os=-none
310
286
                ;;
311
287
        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
312
288
                ;;
313
 
        ms1)
314
 
                basic_machine=mt-unknown
315
 
                ;;
316
289
 
317
290
        # We use `pc' rather than `unknown'
318
291
        # because (1) that's what they normally are, and
332
305
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
333
306
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
334
307
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
335
 
        | avr-* | avr32-* \
 
308
        | avr-* \
336
309
        | bfin-* | bs2000-* \
337
310
        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
338
311
        | clipper-* | craynv-* | cydra-* \
339
312
        | d10v-* | d30v-* | dlx-* \
340
313
        | elxsi-* \
341
 
        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 
314
        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
342
315
        | h8300-* | h8500-* \
343
316
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
344
317
        | i*86-* | i860-* | i960-* | ia64-* \
345
318
        | ip2k-* | iq2000-* \
346
 
        | lm32-* \
347
 
        | m32c-* | m32r-* | m32rle-* \
 
319
        | m32r-* | m32rle-* \
348
320
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
349
 
        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 
321
        | m88110-* | m88k-* | maxq-* | mcore-* \
350
322
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
351
323
        | mips16-* \
352
324
        | mips64-* | mips64el-* \
353
 
        | mips64octeon-* | mips64octeonel-* \
 
325
        | mips64vr-* | mips64vrel-* \
354
326
        | mips64orion-* | mips64orionel-* \
355
 
        | mips64r5900-* | mips64r5900el-* \
356
 
        | mips64vr-* | mips64vrel-* \
357
327
        | mips64vr4100-* | mips64vr4100el-* \
358
328
        | mips64vr4300-* | mips64vr4300el-* \
359
329
        | mips64vr5000-* | mips64vr5000el-* \
366
336
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
367
337
        | mipstx39-* | mipstx39el-* \
368
338
        | mmix-* \
369
 
        | mt-* \
 
339
        | ms1-* \
370
340
        | msp430-* \
371
 
        | nios-* | nios2-* \
372
341
        | none-* | np1-* | ns16k-* | ns32k-* \
373
342
        | orion-* \
374
343
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
375
344
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
376
345
        | pyramid-* \
377
 
        | romp-* | rs6000-* | rx-* \
378
 
        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 
346
        | romp-* | rs6000-* \
 
347
        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
379
348
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
380
 
        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 
349
        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
381
350
        | sparclite-* \
382
 
        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 
351
        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
383
352
        | tahoe-* | thumb-* \
384
353
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
385
 
        | tile-* | tilegx-* \
386
354
        | tron-* \
387
 
        | ubicom32-* \
388
355
        | v850-* | v850e-* | vax-* \
389
356
        | we32k-* \
390
 
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
391
 
        | xstormy16-* | xtensa*-* \
 
357
        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 
358
        | xstormy16-* | xtensa-* \
392
359
        | ymp-* \
393
 
        | z8k-* | z80-*)
 
360
        | z8k-*)
394
361
                ;;
395
 
        # Recognize the basic CPU types without company name, with glob match.
396
 
        xtensa*)
397
 
                basic_machine=$basic_machine-unknown
 
362
        m32c-*)
398
363
                ;;
399
364
        # Recognize the various machine names and aliases which stand
400
365
        # for a CPU type and a company and sometimes even an OS.
458
423
                basic_machine=m68k-apollo
459
424
                os=-bsd
460
425
                ;;
461
 
        aros)
462
 
                basic_machine=i386-pc
463
 
                os=-aros
464
 
                ;;
465
426
        aux)
466
427
                basic_machine=m68k-apple
467
428
                os=-aux
470
431
                basic_machine=ns32k-sequent
471
432
                os=-dynix
472
433
                ;;
473
 
        blackfin)
474
 
                basic_machine=bfin-unknown
475
 
                os=-linux
476
 
                ;;
477
 
        blackfin-*)
478
 
                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
479
 
                os=-linux
480
 
                ;;
481
 
        bluegene*)
482
 
                basic_machine=powerpc-ibm
483
 
                os=-cnk
484
 
                ;;
485
434
        c90)
486
435
                basic_machine=c90-cray
487
436
                os=-unicos
488
437
                ;;
489
 
        cegcc)
490
 
                basic_machine=arm-unknown
491
 
                os=-cegcc
492
 
                ;;
493
438
        convex-c1)
494
439
                basic_machine=c1-convex
495
440
                os=-bsd
518
463
                basic_machine=craynv-cray
519
464
                os=-unicosmp
520
465
                ;;
521
 
        cr16)
522
 
                basic_machine=cr16-unknown
 
466
        cr16c)
 
467
                basic_machine=cr16c-unknown
523
468
                os=-elf
524
469
                ;;
525
470
        crds | unos)
557
502
                basic_machine=m88k-motorola
558
503
                os=-sysv3
559
504
                ;;
560
 
        dicos)
561
 
                basic_machine=i686-pc
562
 
                os=-dicos
563
 
                ;;
564
505
        djgpp)
565
506
                basic_machine=i586-pc
566
507
                os=-msdosdjgpp
715
656
                basic_machine=m68k-isi
716
657
                os=-sysv
717
658
                ;;
718
 
        m68knommu)
719
 
                basic_machine=m68k-unknown
720
 
                os=-linux
721
 
                ;;
722
 
        m68knommu-*)
723
 
                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
724
 
                os=-linux
725
 
                ;;
726
659
        m88k-omron*)
727
660
                basic_machine=m88k-omron
728
661
                ;;
734
667
                basic_machine=ns32k-utek
735
668
                os=-sysv
736
669
                ;;
737
 
        microblaze)
738
 
                basic_machine=microblaze-xilinx
739
 
                ;;
740
670
        mingw32)
741
671
                basic_machine=i386-pc
742
672
                os=-mingw32
743
673
                ;;
744
 
        mingw32ce)
745
 
                basic_machine=arm-unknown
746
 
                os=-mingw32ce
747
 
                ;;
748
674
        miniframe)
749
675
                basic_machine=m68000-convergent
750
676
                ;;
770
696
                basic_machine=i386-pc
771
697
                os=-msdos
772
698
                ;;
773
 
        ms1-*)
774
 
                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
775
 
                ;;
776
699
        mvs)
777
700
                basic_machine=i370-ibm
778
701
                os=-mvs
871
794
                basic_machine=i860-intel
872
795
                os=-osf
873
796
                ;;
874
 
        parisc)
875
 
                basic_machine=hppa-unknown
876
 
                os=-linux
877
 
                ;;
878
 
        parisc-*)
879
 
                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
880
 
                os=-linux
881
 
                ;;
882
797
        pbd)
883
798
                basic_machine=sparc-tti
884
799
                ;;
888
803
        pc532 | pc532-*)
889
804
                basic_machine=ns32k-pc532
890
805
                ;;
891
 
        pc98)
892
 
                basic_machine=i386-pc
893
 
                ;;
894
 
        pc98-*)
895
 
                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
896
 
                ;;
897
806
        pentium | p5 | k5 | k6 | nexgen | viac3)
898
807
                basic_machine=i586-pc
899
808
                ;;
950
859
                basic_machine=i586-unknown
951
860
                os=-pw32
952
861
                ;;
953
 
        rdos)
954
 
                basic_machine=i386-pc
955
 
                os=-rdos
956
 
                ;;
957
862
        rom68k)
958
863
                basic_machine=m68k-rom68k
959
864
                os=-coff
980
885
        sb1el)
981
886
                basic_machine=mipsisa64sb1el-unknown
982
887
                ;;
983
 
        sde)
984
 
                basic_machine=mipsisa32-sde
985
 
                os=-elf
986
 
                ;;
987
888
        sei)
988
889
                basic_machine=mips-sei
989
890
                os=-seiux
995
896
                basic_machine=sh-hitachi
996
897
                os=-hms
997
898
                ;;
998
 
        sh5el)
999
 
                basic_machine=sh5le-unknown
1000
 
                ;;
1001
899
        sh64)
1002
900
                basic_machine=sh64-unknown
1003
901
                ;;
1087
985
                basic_machine=tic6x-unknown
1088
986
                os=-coff
1089
987
                ;;
1090
 
        # This must be matched before tile*.
1091
 
        tilegx*)
1092
 
                basic_machine=tilegx-unknown
1093
 
                os=-linux-gnu
1094
 
                ;;
1095
 
        tile*)
1096
 
                basic_machine=tile-unknown
1097
 
                os=-linux-gnu
1098
 
                ;;
1099
988
        tx39)
1100
989
                basic_machine=mipstx39-unknown
1101
990
                ;;
1171
1060
                basic_machine=z8k-unknown
1172
1061
                os=-sim
1173
1062
                ;;
1174
 
        z80-*-coff)
1175
 
                basic_machine=z80-unknown
1176
 
                os=-sim
1177
 
                ;;
1178
1063
        none)
1179
1064
                basic_machine=none-none
1180
1065
                os=-none
1213
1098
        we32k)
1214
1099
                basic_machine=we32k-att
1215
1100
                ;;
1216
 
        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 
1101
        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1217
1102
                basic_machine=sh-unknown
1218
1103
                ;;
1219
 
        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 
1104
        sparc | sparcv8 | sparcv9 | sparcv9b)
1220
1105
                basic_machine=sparc-sun
1221
1106
                ;;
1222
1107
        cydra)
1263
1148
        # First match some system type aliases
1264
1149
        # that might get confused with valid system types.
1265
1150
        # -solaris* is a basic system type, with this one exception.
1266
 
        -auroraux)
1267
 
                os=-auroraux
1268
 
                ;;
1269
1151
        -solaris1 | -solaris1.*)
1270
1152
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
1271
1153
                ;;
1286
1168
        # Each alternative MUST END IN A *, to match a version number.
1287
1169
        # -sysv* is not here because it comes later, after sysvr4.
1288
1170
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1289
 
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1290
 
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1291
 
              | -sym* | -kopensolaris* \
 
1171
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 
1172
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1292
1173
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1293
 
              | -aos* | -aros* \
 
1174
              | -aos* \
1294
1175
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1295
1176
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1296
 
              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1297
 
              | -openbsd* | -solidbsd* \
 
1177
              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1298
1178
              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1299
1179
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1300
1180
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1301
1181
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1302
 
              | -chorusos* | -chorusrdb* | -cegcc* \
 
1182
              | -chorusos* | -chorusrdb* \
1303
1183
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1304
 
              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1305
 
              | -uxpv* | -beos* | -mpeix* | -udk* \
 
1184
              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1306
1185
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1307
1186
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1308
1187
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1309
1188
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1310
1189
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1311
1190
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1312
 
              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 
1191
              | -skyos* | -haiku*)
1313
1192
        # Remember, each alternative MUST END IN *, to match a version number.
1314
1193
                ;;
1315
1194
        -qnx*)
1439
1318
        -zvmoe)
1440
1319
                os=-zvmoe
1441
1320
                ;;
1442
 
        -dicos*)
1443
 
                os=-dicos
1444
 
                ;;
1445
 
        -nacl*)
1446
 
                ;;
1447
1321
        -none)
1448
1322
                ;;
1449
1323
        *)
1466
1340
# system, and we'll never get to this point.
1467
1341
 
1468
1342
case $basic_machine in
1469
 
        score-*)
1470
 
                os=-elf
1471
 
                ;;
1472
 
        spu-*)
1473
 
                os=-elf
1474
 
                ;;
1475
1343
        *-acorn)
1476
1344
                os=-riscix1.2
1477
1345
                ;;
1481
1349
        arm*-semi)
1482
1350
                os=-aout
1483
1351
                ;;
1484
 
        c4x-* | tic4x-*)
1485
 
                os=-coff
1486
 
                ;;
 
1352
    c4x-* | tic4x-*)
 
1353
        os=-coff
 
1354
        ;;
1487
1355
        # This must come before the *-dec entry.
1488
1356
        pdp10-*)
1489
1357
                os=-tops20
1509
1377
        m68*-cisco)
1510
1378
                os=-aout
1511
1379
                ;;
1512
 
        mep-*)
1513
 
                os=-elf
1514
 
                ;;
1515
1380
        mips*-cisco)
1516
1381
                os=-elf
1517
1382
                ;;
1641
1506
                        -sunos*)
1642
1507
                                vendor=sun
1643
1508
                                ;;
1644
 
                        -cnk*|-aix*)
 
1509
                        -aix*)
1645
1510
                                vendor=ibm
1646
1511
                                ;;
1647
1512
                        -beos*)