rice 1.4.3 → 1.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (54) hide show
  1. data/COPYING +2 -2
  2. data/Doxyfile +1 -1
  3. data/Makefile.in +296 -166
  4. data/README +18 -13
  5. data/Rakefile +3 -2
  6. data/aclocal.m4 +375 -248
  7. data/config.guess +296 -261
  8. data/config.sub +268 -94
  9. data/configure +2789 -3054
  10. data/configure.ac +1 -1
  11. data/depcomp +403 -197
  12. data/extconf.rb +14 -3
  13. data/install-sh +139 -119
  14. data/missing +154 -306
  15. data/rice/Builtin_Object_defn.hpp +0 -1
  16. data/rice/Constructor.hpp +31 -30
  17. data/rice/Data_Object_defn.hpp +8 -2
  18. data/rice/Hash.hpp +26 -9
  19. data/rice/Hash.ipp +52 -60
  20. data/rice/Makefile.am +0 -1
  21. data/rice/Makefile.in +278 -152
  22. data/rice/Module_impl.ipp +1 -1
  23. data/rice/VM.cpp +1 -11
  24. data/rice/config.hpp +3 -0
  25. data/rice/config.hpp.in +3 -0
  26. data/rice/detail/Auto_Function_Wrapper.hpp +69 -0
  27. data/rice/detail/Auto_Function_Wrapper.ipp +815 -512
  28. data/rice/detail/Auto_Member_Function_Wrapper.hpp +69 -0
  29. data/rice/detail/Auto_Member_Function_Wrapper.ipp +543 -272
  30. data/rice/detail/object_call.hpp +1 -0
  31. data/rice/detail/ruby.hpp +0 -9
  32. data/rice/detail/ruby_version_code.hpp +1 -1
  33. data/rice/detail/st.hpp +0 -38
  34. data/rice/protect.hpp +1 -0
  35. data/rice/protect.ipp +1 -0
  36. data/rice/to_from_ruby.ipp +1 -1
  37. data/ruby.ac +2 -2
  38. data/ruby/Makefile.in +221 -134
  39. data/ruby/lib/Makefile.in +133 -44
  40. data/ruby/lib/mkmf-rice.rb.in +1 -4
  41. data/ruby/lib/version.rb +1 -1
  42. data/sample/Makefile.in +96 -31
  43. data/test/Makefile.am +0 -1
  44. data/test/Makefile.in +617 -219
  45. data/test/ext/Makefile.in +96 -31
  46. data/test/test_Class.cpp +2 -2
  47. data/test/test_Data_Object.cpp +11 -11
  48. data/test/test_Hash.cpp +7 -4
  49. data/test/test_Module.cpp +17 -1
  50. data/test/test_To_From_Ruby.cpp +44 -0
  51. data/test/test_rice.rb +2 -2
  52. metadata +29 -43
  53. data/rice/Allocation_Strategies.hpp +0 -37
  54. data/test/test_Allocation_Strategies.cpp +0 -77
data/config.sub CHANGED
@@ -1,44 +1,42 @@
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 Free Software Foundation,
5
- # Inc.
4
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
+ # 2011, 2012, 2013 Free Software Foundation, Inc.
6
6
 
7
- timestamp='2006-09-20'
7
+ timestamp='2012-12-29'
8
8
 
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
9
+ # This file is free software; you can redistribute it and/or modify it
10
+ # under the terms of the GNU General Public License as published by
11
+ # the Free Software Foundation; either version 3 of the License, or
16
12
  # (at your option) any later version.
17
13
  #
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.
14
+ # This program is distributed in the hope that it will be useful, but
15
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
16
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17
+ # General Public License for more details.
22
18
  #
23
19
  # 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.
20
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
27
21
  #
28
22
  # As a special exception to the GNU General Public License, if you
29
23
  # distribute this file as part of a program that contains a
30
24
  # configuration script generated by Autoconf, you may include it under
31
- # the same distribution terms that you use for the rest of that program.
25
+ # the same distribution terms that you use for the rest of that
26
+ # program. This Exception is an additional permission under section 7
27
+ # of the GNU General Public License, version 3 ("GPLv3").
32
28
 
33
29
 
34
- # Please send patches to <config-patches@gnu.org>. Submit a context
35
- # diff and a properly formatted ChangeLog entry.
30
+ # Please send patches with a ChangeLog entry to config-patches@gnu.org.
36
31
  #
37
32
  # Configuration subroutine to validate and canonicalize a configuration type.
38
33
  # Supply the specified configuration type as an argument.
39
34
  # If it is invalid, we print an error message on stderr and exit with code 1.
40
35
  # Otherwise, we print the canonical config type on stdout and succeed.
41
36
 
37
+ # You can get the latest version of this script from:
38
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
39
+
42
40
  # This file is supposed to be the same for all GNU packages
43
41
  # and recognize all the CPU types, system types and aliases
44
42
  # that are meaningful with *any* GNU software.
@@ -72,8 +70,9 @@ Report bugs and patches to <config-patches@gnu.org>."
72
70
  version="\
73
71
  GNU config.sub ($timestamp)
74
72
 
75
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
76
- Free Software Foundation, Inc.
73
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
74
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
75
+ 2012, 2013 Free Software Foundation, Inc.
77
76
 
78
77
  This is free software; see the source for copying conditions. There is NO
79
78
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,12 +119,18 @@ esac
120
119
  # Here we must recognize all the valid KERNEL-OS combinations.
121
120
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
122
121
  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* | \
122
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
123
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
124
+ knetbsd*-gnu* | netbsd*-gnu* | \
125
+ kopensolaris*-gnu* | \
125
126
  storm-chaos* | os2-emx* | rtmk-nova*)
126
127
  os=-$maybe_os
127
128
  basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
128
129
  ;;
130
+ android-linux)
131
+ os=-linux-android
132
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
133
+ ;;
129
134
  *)
130
135
  basic_machine=`echo $1 | sed 's/-[^-]*$//'`
131
136
  if [ $basic_machine != $1 ]
@@ -148,10 +153,13 @@ case $os in
148
153
  -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149
154
  -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150
155
  -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151
- -apple | -axis | -knuth | -cray)
156
+ -apple | -axis | -knuth | -cray | -microblaze*)
152
157
  os=
153
158
  basic_machine=$1
154
159
  ;;
160
+ -bluegene*)
161
+ os=-cnk
162
+ ;;
155
163
  -sim | -cisco | -oki | -wec | -winbond)
156
164
  os=
157
165
  basic_machine=$1
@@ -166,10 +174,10 @@ case $os in
166
174
  os=-chorusos
167
175
  basic_machine=$1
168
176
  ;;
169
- -chorusrdb)
170
- os=-chorusrdb
177
+ -chorusrdb)
178
+ os=-chorusrdb
171
179
  basic_machine=$1
172
- ;;
180
+ ;;
173
181
  -hiux*)
174
182
  os=-hiuxwe2
175
183
  ;;
@@ -214,6 +222,12 @@ case $os in
214
222
  -isc*)
215
223
  basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
216
224
  ;;
225
+ -lynx*178)
226
+ os=-lynxos178
227
+ ;;
228
+ -lynx*5)
229
+ os=-lynxos5
230
+ ;;
217
231
  -lynx*)
218
232
  os=-lynxos
219
233
  ;;
@@ -238,24 +252,34 @@ case $basic_machine in
238
252
  # Some are omitted here because they have special meanings below.
239
253
  1750a | 580 \
240
254
  | a29k \
255
+ | aarch64 | aarch64_be \
241
256
  | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
242
257
  | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
243
258
  | am33_2.0 \
244
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
259
+ | arc \
260
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
261
+ | avr | avr32 \
262
+ | be32 | be64 \
245
263
  | bfin \
246
264
  | c4x | clipper \
247
265
  | d10v | d30v | dlx | dsp16xx \
248
- | fr30 | frv \
266
+ | epiphany \
267
+ | fido | fr30 | frv \
249
268
  | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
269
+ | hexagon \
250
270
  | i370 | i860 | i960 | ia64 \
251
271
  | ip2k | iq2000 \
272
+ | le32 | le64 \
273
+ | lm32 \
252
274
  | m32c | m32r | m32rle | m68000 | m68k | m88k \
253
- | maxq | mb | microblaze | mcore \
275
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
254
276
  | mips | mipsbe | mipseb | mipsel | mipsle \
255
277
  | mips16 \
256
278
  | mips64 | mips64el \
257
- | mips64vr | mips64vrel \
279
+ | mips64octeon | mips64octeonel \
258
280
  | mips64orion | mips64orionel \
281
+ | mips64r5900 | mips64r5900el \
282
+ | mips64vr | mips64vrel \
259
283
  | mips64vr4100 | mips64vr4100el \
260
284
  | mips64vr4300 | mips64vr4300el \
261
285
  | mips64vr5000 | mips64vr5000el \
@@ -268,29 +292,42 @@ case $basic_machine in
268
292
  | mipsisa64sr71k | mipsisa64sr71kel \
269
293
  | mipstx39 | mipstx39el \
270
294
  | mn10200 | mn10300 \
295
+ | moxie \
271
296
  | mt \
272
297
  | msp430 \
298
+ | nds32 | nds32le | nds32be \
273
299
  | nios | nios2 \
274
300
  | ns16k | ns32k \
301
+ | open8 \
275
302
  | or32 \
276
303
  | pdp10 | pdp11 | pj | pjl \
277
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
304
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
278
305
  | pyramid \
306
+ | rl78 | rx \
279
307
  | score \
280
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
308
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
281
309
  | sh64 | sh64le \
282
310
  | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
283
311
  | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
284
- | spu | strongarm \
285
- | tahoe | thumb | tic4x | tic80 | tron \
286
- | v850 | v850e \
312
+ | spu \
313
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
314
+ | ubicom32 \
315
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
287
316
  | we32k \
288
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
289
- | z8k)
317
+ | x86 | xc16x | xstormy16 | xtensa \
318
+ | z8k | z80)
290
319
  basic_machine=$basic_machine-unknown
291
320
  ;;
292
- m6811 | m68hc11 | m6812 | m68hc12)
293
- # Motorola 68HC11/12.
321
+ c54x)
322
+ basic_machine=tic54x-unknown
323
+ ;;
324
+ c55x)
325
+ basic_machine=tic55x-unknown
326
+ ;;
327
+ c6x)
328
+ basic_machine=tic6x-unknown
329
+ ;;
330
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
294
331
  basic_machine=$basic_machine-unknown
295
332
  os=-none
296
333
  ;;
@@ -300,6 +337,21 @@ case $basic_machine in
300
337
  basic_machine=mt-unknown
301
338
  ;;
302
339
 
340
+ strongarm | thumb | xscale)
341
+ basic_machine=arm-unknown
342
+ ;;
343
+ xgate)
344
+ basic_machine=$basic_machine-unknown
345
+ os=-none
346
+ ;;
347
+ xscaleeb)
348
+ basic_machine=armeb-unknown
349
+ ;;
350
+
351
+ xscaleel)
352
+ basic_machine=armel-unknown
353
+ ;;
354
+
303
355
  # We use `pc' rather than `unknown'
304
356
  # because (1) that's what they normally are, and
305
357
  # (2) the word "unknown" tends to confuse beginning users.
@@ -314,29 +366,37 @@ case $basic_machine in
314
366
  # Recognize the basic CPU types with company name.
315
367
  580-* \
316
368
  | a29k-* \
369
+ | aarch64-* | aarch64_be-* \
317
370
  | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
318
371
  | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
319
372
  | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
320
373
  | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
321
374
  | avr-* | avr32-* \
375
+ | be32-* | be64-* \
322
376
  | bfin-* | bs2000-* \
323
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
377
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
324
378
  | clipper-* | craynv-* | cydra-* \
325
379
  | d10v-* | d30v-* | dlx-* \
326
380
  | elxsi-* \
327
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
381
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
328
382
  | h8300-* | h8500-* \
329
383
  | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
384
+ | hexagon-* \
330
385
  | i*86-* | i860-* | i960-* | ia64-* \
331
386
  | ip2k-* | iq2000-* \
387
+ | le32-* | le64-* \
388
+ | lm32-* \
332
389
  | m32c-* | m32r-* | m32rle-* \
333
390
  | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
334
- | m88110-* | m88k-* | maxq-* | mcore-* \
391
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
392
+ | microblaze-* | microblazeel-* \
335
393
  | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
336
394
  | mips16-* \
337
395
  | mips64-* | mips64el-* \
338
- | mips64vr-* | mips64vrel-* \
396
+ | mips64octeon-* | mips64octeonel-* \
339
397
  | mips64orion-* | mips64orionel-* \
398
+ | mips64r5900-* | mips64r5900el-* \
399
+ | mips64vr-* | mips64vrel-* \
340
400
  | mips64vr4100-* | mips64vr4100el-* \
341
401
  | mips64vr4300-* | mips64vr4300el-* \
342
402
  | mips64vr5000-* | mips64vr5000el-* \
@@ -351,27 +411,36 @@ case $basic_machine in
351
411
  | mmix-* \
352
412
  | mt-* \
353
413
  | msp430-* \
414
+ | nds32-* | nds32le-* | nds32be-* \
354
415
  | nios-* | nios2-* \
355
416
  | none-* | np1-* | ns16k-* | ns32k-* \
417
+ | open8-* \
356
418
  | orion-* \
357
419
  | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
358
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
420
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
359
421
  | pyramid-* \
360
- | romp-* | rs6000-* \
361
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
422
+ | rl78-* | romp-* | rs6000-* | rx-* \
423
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
362
424
  | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
363
425
  | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
364
426
  | sparclite-* \
365
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
366
- | tahoe-* | thumb-* \
427
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
428
+ | tahoe-* \
367
429
  | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
430
+ | tile*-* \
368
431
  | tron-* \
369
- | v850-* | v850e-* | vax-* \
432
+ | ubicom32-* \
433
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
434
+ | vax-* \
370
435
  | we32k-* \
371
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
372
- | xstormy16-* | xtensa-* \
436
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
437
+ | xstormy16-* | xtensa*-* \
373
438
  | ymp-* \
374
- | z8k-*)
439
+ | z8k-* | z80-*)
440
+ ;;
441
+ # Recognize the basic CPU types without company name, with glob match.
442
+ xtensa*)
443
+ basic_machine=$basic_machine-unknown
375
444
  ;;
376
445
  # Recognize the various machine names and aliases which stand
377
446
  # for a CPU type and a company and sometimes even an OS.
@@ -389,7 +458,7 @@ case $basic_machine in
389
458
  basic_machine=a29k-amd
390
459
  os=-udi
391
460
  ;;
392
- abacus)
461
+ abacus)
393
462
  basic_machine=abacus-unknown
394
463
  ;;
395
464
  adobe68k)
@@ -435,6 +504,10 @@ case $basic_machine in
435
504
  basic_machine=m68k-apollo
436
505
  os=-bsd
437
506
  ;;
507
+ aros)
508
+ basic_machine=i386-pc
509
+ os=-aros
510
+ ;;
438
511
  aux)
439
512
  basic_machine=m68k-apple
440
513
  os=-aux
@@ -443,10 +516,35 @@ case $basic_machine in
443
516
  basic_machine=ns32k-sequent
444
517
  os=-dynix
445
518
  ;;
519
+ blackfin)
520
+ basic_machine=bfin-unknown
521
+ os=-linux
522
+ ;;
523
+ blackfin-*)
524
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
525
+ os=-linux
526
+ ;;
527
+ bluegene*)
528
+ basic_machine=powerpc-ibm
529
+ os=-cnk
530
+ ;;
531
+ c54x-*)
532
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
533
+ ;;
534
+ c55x-*)
535
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
536
+ ;;
537
+ c6x-*)
538
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
539
+ ;;
446
540
  c90)
447
541
  basic_machine=c90-cray
448
542
  os=-unicos
449
543
  ;;
544
+ cegcc)
545
+ basic_machine=arm-unknown
546
+ os=-cegcc
547
+ ;;
450
548
  convex-c1)
451
549
  basic_machine=c1-convex
452
550
  os=-bsd
@@ -475,8 +573,8 @@ case $basic_machine in
475
573
  basic_machine=craynv-cray
476
574
  os=-unicosmp
477
575
  ;;
478
- cr16c)
479
- basic_machine=cr16c-unknown
576
+ cr16 | cr16-*)
577
+ basic_machine=cr16-unknown
480
578
  os=-elf
481
579
  ;;
482
580
  crds | unos)
@@ -514,6 +612,10 @@ case $basic_machine in
514
612
  basic_machine=m88k-motorola
515
613
  os=-sysv3
516
614
  ;;
615
+ dicos)
616
+ basic_machine=i686-pc
617
+ os=-dicos
618
+ ;;
517
619
  djgpp)
518
620
  basic_machine=i586-pc
519
621
  os=-msdosdjgpp
@@ -629,7 +731,6 @@ case $basic_machine in
629
731
  i370-ibm* | ibm*)
630
732
  basic_machine=i370-ibm
631
733
  ;;
632
- # I'm not sure what "Sysv32" means. Should this be sysv3.2?
633
734
  i*86v32)
634
735
  basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
635
736
  os=-sysv32
@@ -668,6 +769,14 @@ case $basic_machine in
668
769
  basic_machine=m68k-isi
669
770
  os=-sysv
670
771
  ;;
772
+ m68knommu)
773
+ basic_machine=m68k-unknown
774
+ os=-linux
775
+ ;;
776
+ m68knommu-*)
777
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
778
+ os=-linux
779
+ ;;
671
780
  m88k-omron*)
672
781
  basic_machine=m88k-omron
673
782
  ;;
@@ -679,10 +788,21 @@ case $basic_machine in
679
788
  basic_machine=ns32k-utek
680
789
  os=-sysv
681
790
  ;;
791
+ microblaze*)
792
+ basic_machine=microblaze-xilinx
793
+ ;;
794
+ mingw64)
795
+ basic_machine=x86_64-pc
796
+ os=-mingw64
797
+ ;;
682
798
  mingw32)
683
799
  basic_machine=i386-pc
684
800
  os=-mingw32
685
801
  ;;
802
+ mingw32ce)
803
+ basic_machine=arm-unknown
804
+ os=-mingw32ce
805
+ ;;
686
806
  miniframe)
687
807
  basic_machine=m68000-convergent
688
808
  ;;
@@ -711,10 +831,18 @@ case $basic_machine in
711
831
  ms1-*)
712
832
  basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
713
833
  ;;
834
+ msys)
835
+ basic_machine=i386-pc
836
+ os=-msys
837
+ ;;
714
838
  mvs)
715
839
  basic_machine=i370-ibm
716
840
  os=-mvs
717
841
  ;;
842
+ nacl)
843
+ basic_machine=le32-unknown
844
+ os=-nacl
845
+ ;;
718
846
  ncr3000)
719
847
  basic_machine=i486-ncr
720
848
  os=-sysv4
@@ -779,6 +907,12 @@ case $basic_machine in
779
907
  np1)
780
908
  basic_machine=np1-gould
781
909
  ;;
910
+ neo-tandem)
911
+ basic_machine=neo-tandem
912
+ ;;
913
+ nse-tandem)
914
+ basic_machine=nse-tandem
915
+ ;;
782
916
  nsr-tandem)
783
917
  basic_machine=nsr-tandem
784
918
  ;;
@@ -809,6 +943,14 @@ case $basic_machine in
809
943
  basic_machine=i860-intel
810
944
  os=-osf
811
945
  ;;
946
+ parisc)
947
+ basic_machine=hppa-unknown
948
+ os=-linux
949
+ ;;
950
+ parisc-*)
951
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
952
+ os=-linux
953
+ ;;
812
954
  pbd)
813
955
  basic_machine=sparc-tti
814
956
  ;;
@@ -853,9 +995,10 @@ case $basic_machine in
853
995
  ;;
854
996
  power) basic_machine=power-ibm
855
997
  ;;
856
- ppc) basic_machine=powerpc-unknown
998
+ ppc | ppcbe) basic_machine=powerpc-unknown
857
999
  ;;
858
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1000
+ ppc-* | ppcbe-*)
1001
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
859
1002
  ;;
860
1003
  ppcle | powerpclittle | ppc-le | powerpc-little)
861
1004
  basic_machine=powerpcle-unknown
@@ -880,7 +1023,11 @@ case $basic_machine in
880
1023
  basic_machine=i586-unknown
881
1024
  os=-pw32
882
1025
  ;;
883
- rdos)
1026
+ rdos | rdos64)
1027
+ basic_machine=x86_64-pc
1028
+ os=-rdos
1029
+ ;;
1030
+ rdos32)
884
1031
  basic_machine=i386-pc
885
1032
  os=-rdos
886
1033
  ;;
@@ -925,6 +1072,9 @@ case $basic_machine in
925
1072
  basic_machine=sh-hitachi
926
1073
  os=-hms
927
1074
  ;;
1075
+ sh5el)
1076
+ basic_machine=sh5le-unknown
1077
+ ;;
928
1078
  sh64)
929
1079
  basic_machine=sh64-unknown
930
1080
  ;;
@@ -946,6 +1096,9 @@ case $basic_machine in
946
1096
  basic_machine=i860-stratus
947
1097
  os=-sysv4
948
1098
  ;;
1099
+ strongarm-* | thumb-*)
1100
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1101
+ ;;
949
1102
  sun2)
950
1103
  basic_machine=m68000-sun
951
1104
  ;;
@@ -1002,17 +1155,9 @@ case $basic_machine in
1002
1155
  basic_machine=t90-cray
1003
1156
  os=-unicos
1004
1157
  ;;
1005
- tic54x | c54x*)
1006
- basic_machine=tic54x-unknown
1007
- os=-coff
1008
- ;;
1009
- tic55x | c55x*)
1010
- basic_machine=tic55x-unknown
1011
- os=-coff
1012
- ;;
1013
- tic6x | c6x*)
1014
- basic_machine=tic6x-unknown
1015
- os=-coff
1158
+ tile*)
1159
+ basic_machine=$basic_machine-unknown
1160
+ os=-linux-gnu
1016
1161
  ;;
1017
1162
  tx39)
1018
1163
  basic_machine=mipstx39-unknown
@@ -1081,6 +1226,9 @@ case $basic_machine in
1081
1226
  xps | xps100)
1082
1227
  basic_machine=xps100-honeywell
1083
1228
  ;;
1229
+ xscale-* | xscalee[bl]-*)
1230
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1231
+ ;;
1084
1232
  ymp)
1085
1233
  basic_machine=ymp-cray
1086
1234
  os=-unicos
@@ -1089,6 +1237,10 @@ case $basic_machine in
1089
1237
  basic_machine=z8k-unknown
1090
1238
  os=-sim
1091
1239
  ;;
1240
+ z80-*-coff)
1241
+ basic_machine=z80-unknown
1242
+ os=-sim
1243
+ ;;
1092
1244
  none)
1093
1245
  basic_machine=none-none
1094
1246
  os=-none
@@ -1127,7 +1279,7 @@ case $basic_machine in
1127
1279
  we32k)
1128
1280
  basic_machine=we32k-att
1129
1281
  ;;
1130
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1282
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1131
1283
  basic_machine=sh-unknown
1132
1284
  ;;
1133
1285
  sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1174,9 +1326,12 @@ esac
1174
1326
  if [ x"$os" != x"" ]
1175
1327
  then
1176
1328
  case $os in
1177
- # First match some system type aliases
1178
- # that might get confused with valid system types.
1329
+ # First match some system type aliases
1330
+ # that might get confused with valid system types.
1179
1331
  # -solaris* is a basic system type, with this one exception.
1332
+ -auroraux)
1333
+ os=-auroraux
1334
+ ;;
1180
1335
  -solaris1 | -solaris1.*)
1181
1336
  os=`echo $os | sed -e 's|solaris1|sunos4|'`
1182
1337
  ;;
@@ -1197,21 +1352,23 @@ case $os in
1197
1352
  # Each alternative MUST END IN A *, to match a version number.
1198
1353
  # -sysv* is not here because it comes later, after sysvr4.
1199
1354
  -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1200
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1201
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1355
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1356
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1357
+ | -sym* | -kopensolaris* \
1202
1358
  | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1203
- | -aos* \
1359
+ | -aos* | -aros* \
1204
1360
  | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1205
1361
  | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1206
1362
  | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1207
- | -openbsd* | -solidbsd* \
1363
+ | -bitrig* | -openbsd* | -solidbsd* \
1208
1364
  | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1209
1365
  | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1210
1366
  | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1211
1367
  | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1212
- | -chorusos* | -chorusrdb* \
1213
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1214
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1368
+ | -chorusos* | -chorusrdb* | -cegcc* \
1369
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1370
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1371
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1215
1372
  | -uxpv* | -beos* | -mpeix* | -udk* \
1216
1373
  | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1217
1374
  | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1219,7 +1376,7 @@ case $os in
1219
1376
  | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1220
1377
  | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1221
1378
  | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1222
- | -skyos* | -haiku* | -rdos* | -toppers*)
1379
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1223
1380
  # Remember, each alternative MUST END IN *, to match a version number.
1224
1381
  ;;
1225
1382
  -qnx*)
@@ -1258,7 +1415,7 @@ case $os in
1258
1415
  -opened*)
1259
1416
  os=-openedition
1260
1417
  ;;
1261
- -os400*)
1418
+ -os400*)
1262
1419
  os=-os400
1263
1420
  ;;
1264
1421
  -wince*)
@@ -1307,7 +1464,7 @@ case $os in
1307
1464
  -sinix*)
1308
1465
  os=-sysv4
1309
1466
  ;;
1310
- -tpf*)
1467
+ -tpf*)
1311
1468
  os=-tpf
1312
1469
  ;;
1313
1470
  -triton*)
@@ -1349,6 +1506,11 @@ case $os in
1349
1506
  -zvmoe)
1350
1507
  os=-zvmoe
1351
1508
  ;;
1509
+ -dicos*)
1510
+ os=-dicos
1511
+ ;;
1512
+ -nacl*)
1513
+ ;;
1352
1514
  -none)
1353
1515
  ;;
1354
1516
  *)
@@ -1371,10 +1533,10 @@ else
1371
1533
  # system, and we'll never get to this point.
1372
1534
 
1373
1535
  case $basic_machine in
1374
- score-*)
1536
+ score-*)
1375
1537
  os=-elf
1376
1538
  ;;
1377
- spu-*)
1539
+ spu-*)
1378
1540
  os=-elf
1379
1541
  ;;
1380
1542
  *-acorn)
@@ -1386,8 +1548,20 @@ case $basic_machine in
1386
1548
  arm*-semi)
1387
1549
  os=-aout
1388
1550
  ;;
1389
- c4x-* | tic4x-*)
1390
- os=-coff
1551
+ c4x-* | tic4x-*)
1552
+ os=-coff
1553
+ ;;
1554
+ hexagon-*)
1555
+ os=-elf
1556
+ ;;
1557
+ tic54x-*)
1558
+ os=-coff
1559
+ ;;
1560
+ tic55x-*)
1561
+ os=-coff
1562
+ ;;
1563
+ tic6x-*)
1564
+ os=-coff
1391
1565
  ;;
1392
1566
  # This must come before the *-dec entry.
1393
1567
  pdp10-*)
@@ -1407,13 +1581,13 @@ case $basic_machine in
1407
1581
  ;;
1408
1582
  m68000-sun)
1409
1583
  os=-sunos3
1410
- # This also exists in the configure program, but was not the
1411
- # default.
1412
- # os=-sunos4
1413
1584
  ;;
1414
1585
  m68*-cisco)
1415
1586
  os=-aout
1416
1587
  ;;
1588
+ mep-*)
1589
+ os=-elf
1590
+ ;;
1417
1591
  mips*-cisco)
1418
1592
  os=-elf
1419
1593
  ;;
@@ -1438,7 +1612,7 @@ case $basic_machine in
1438
1612
  *-ibm)
1439
1613
  os=-aix
1440
1614
  ;;
1441
- *-knuth)
1615
+ *-knuth)
1442
1616
  os=-mmixware
1443
1617
  ;;
1444
1618
  *-wec)
@@ -1543,7 +1717,7 @@ case $basic_machine in
1543
1717
  -sunos*)
1544
1718
  vendor=sun
1545
1719
  ;;
1546
- -aix*)
1720
+ -cnk*|-aix*)
1547
1721
  vendor=ibm
1548
1722
  ;;
1549
1723
  -beos*)