google_hash 0.8.1 → 0.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (121) hide show
  1. data/ChangeLog.txt +2 -0
  2. data/VERSION +1 -1
  3. data/ext/clean.bat +0 -0
  4. data/ext/clean.sh +4 -0
  5. data/ext/extconf.rb +4 -5
  6. data/ext/go.bat +0 -0
  7. data/ext/sparsehash-2.0.2/AUTHORS +2 -0
  8. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/COPYING +0 -0
  9. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/ChangeLog +60 -0
  10. data/ext/sparsehash-2.0.2/INSTALL +365 -0
  11. data/ext/sparsehash-2.0.2/Makefile +1336 -0
  12. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/Makefile.am +97 -40
  13. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/Makefile.in +538 -256
  14. data/ext/sparsehash-2.0.2/NEWS +188 -0
  15. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/README +4 -10
  16. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/README_windows.txt +3 -3
  17. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/TODO +0 -0
  18. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/aclocal.m4 +266 -166
  19. data/ext/sparsehash-2.0.2/allocator.patch +31 -0
  20. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/config.guess +235 -234
  21. data/ext/sparsehash-2.0.2/config.status +1238 -0
  22. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/config.sub +198 -64
  23. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/configure +1118 -1000
  24. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/configure.ac +4 -5
  25. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/depcomp +136 -36
  26. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/dense_hash_map.html +182 -67
  27. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/dense_hash_set.html +173 -74
  28. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/designstyle.css +0 -6
  29. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/implementation.html +0 -0
  30. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/index.html +4 -5
  31. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/performance.html +1 -1
  32. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/sparse_hash_map.html +190 -58
  33. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/sparse_hash_set.html +180 -65
  34. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/sparsetable.html +1 -1
  35. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/Makefile +0 -0
  36. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/README +0 -0
  37. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/example.c +1 -0
  38. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/libchash.c +1 -0
  39. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/libchash.h +1 -0
  40. data/ext/sparsehash-2.0.2/install-sh +520 -0
  41. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/acx_pthread.m4 +34 -0
  42. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/google_namespace.m4 +0 -0
  43. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/namespaces.m4 +0 -0
  44. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/stl_hash.m4 +0 -0
  45. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/stl_hash_fun.m4 +0 -0
  46. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/missing +60 -44
  47. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb.sh +0 -0
  48. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/README +0 -0
  49. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/changelog +42 -0
  50. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/compat +0 -0
  51. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/control +1 -1
  52. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/copyright +5 -4
  53. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/docs +0 -0
  54. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/rules +0 -0
  55. data/ext/sparsehash-2.0.2/packages/deb/sparsehash.dirs +5 -0
  56. data/ext/sparsehash-2.0.2/packages/deb/sparsehash.install +6 -0
  57. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/rpm.sh +1 -1
  58. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/rpm/rpm.spec +5 -3
  59. data/ext/{sparsehash-1.8.1/google-sparsehash.sln → sparsehash-2.0.2/sparsehash.sln} +0 -0
  60. data/ext/sparsehash-2.0.2/src/config.h +132 -0
  61. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/config.h.in +0 -3
  62. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/config.h.include +0 -1
  63. data/ext/sparsehash-2.0.2/src/google/dense_hash_map +34 -0
  64. data/ext/sparsehash-2.0.2/src/google/dense_hash_set +34 -0
  65. data/ext/sparsehash-2.0.2/src/google/sparse_hash_map +34 -0
  66. data/ext/sparsehash-2.0.2/src/google/sparse_hash_set +34 -0
  67. data/ext/sparsehash-2.0.2/src/google/sparsehash/densehashtable.h +34 -0
  68. data/ext/sparsehash-2.0.2/src/google/sparsehash/hashtable-common.h +34 -0
  69. data/ext/sparsehash-2.0.2/src/google/sparsehash/libc_allocator_with_realloc.h +34 -0
  70. data/ext/sparsehash-2.0.2/src/google/sparsehash/sparsehashtable.h +34 -0
  71. data/ext/sparsehash-2.0.2/src/google/sparsetable +34 -0
  72. data/ext/sparsehash-2.0.2/src/google/template_util.h +34 -0
  73. data/ext/sparsehash-2.0.2/src/google/type_traits.h +34 -0
  74. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/hash_test_interface.h +64 -37
  75. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/hashtable_test.cc +415 -141
  76. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/libc_allocator_with_realloc_test.cc +16 -23
  77. data/ext/sparsehash-2.0.2/src/simple_compat_test.cc +106 -0
  78. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/simple_test.cc +8 -5
  79. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/dense_hash_map +80 -37
  80. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/dense_hash_set +64 -34
  81. data/ext/{sparsehash-1.8.1/src/google/sparsehash → sparsehash-2.0.2/src/sparsehash/internal}/densehashtable.h +247 -173
  82. data/ext/sparsehash-2.0.2/src/sparsehash/internal/hashtable-common.h +381 -0
  83. data/ext/{sparsehash-1.8.1/src/google/sparsehash → sparsehash-2.0.2/src/sparsehash/internal}/libc_allocator_with_realloc.h +5 -7
  84. data/ext/{sparsehash-1.8.1/src/google/sparsehash → sparsehash-2.0.2/src/sparsehash/internal}/sparsehashtable.h +154 -93
  85. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/sparse_hash_map +96 -36
  86. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/sparse_hash_set +85 -32
  87. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/sparsetable +520 -258
  88. data/ext/sparsehash-2.0.2/src/sparsehash/template_util.h +134 -0
  89. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/type_traits.h +153 -35
  90. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/sparsetable_unittest.cc +108 -22
  91. data/ext/sparsehash-2.0.2/src/stamp-h1 +1 -0
  92. data/ext/sparsehash-2.0.2/src/template_util_unittest.cc +134 -0
  93. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/testutil.h +16 -1
  94. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/time_hash_map.cc +259 -94
  95. data/ext/sparsehash-2.0.2/src/type_traits_unittest.cc +636 -0
  96. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/windows/config.h +4 -4
  97. data/ext/sparsehash-2.0.2/src/windows/google/sparsehash/sparseconfig.h +49 -0
  98. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/windows/port.cc +1 -0
  99. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/windows/port.h +4 -13
  100. data/ext/sparsehash-2.0.2/src/windows/sparsehash/internal/sparseconfig.h +49 -0
  101. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/hashtable_test/hashtable_test.vcproj +11 -11
  102. data/ext/sparsehash-2.0.2/vsprojects/libc_allocator_with_realloc_test/libc_allocator_with_realloc_test.vcproj +161 -0
  103. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/simple_test/simple_test.vcproj +10 -10
  104. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/sparsetable_unittest/sparsetable_unittest.vcproj +4 -4
  105. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/time_hash_map/time_hash_map.vcproj +10 -10
  106. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/type_traits_unittest/type_traits_unittest.vcproj +3 -3
  107. data/ext/spec.bat +0 -0
  108. data/ext/template/google_hash.cpp.erb +6 -5
  109. metadata +106 -86
  110. data/ext/sparsehash-1.8.1/AUTHORS +0 -2
  111. data/ext/sparsehash-1.8.1/INSTALL +0 -236
  112. data/ext/sparsehash-1.8.1/NEWS +0 -71
  113. data/ext/sparsehash-1.8.1/compile +0 -99
  114. data/ext/sparsehash-1.8.1/install-sh +0 -323
  115. data/ext/sparsehash-1.8.1/m4/stl_namespace.m4 +0 -25
  116. data/ext/sparsehash-1.8.1/mkinstalldirs +0 -158
  117. data/ext/sparsehash-1.8.1/packages/deb/sparsehash.dirs +0 -2
  118. data/ext/sparsehash-1.8.1/packages/deb/sparsehash.install +0 -2
  119. data/ext/sparsehash-1.8.1/src/google/sparsehash/hashtable-common.h +0 -178
  120. data/ext/sparsehash-1.8.1/src/type_traits_unittest.cc +0 -502
  121. data/ext/sparsehash-1.8.1/src/windows/google/sparsehash/sparseconfig.h +0 -32
@@ -1,10 +1,10 @@
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 Free Software Foundation, Inc.
6
6
 
7
- timestamp='2007-06-28'
7
+ timestamp='2011-03-23'
8
8
 
9
9
  # This file is (in principle) common to ALL GNU software.
10
10
  # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2007-06-28'
32
32
 
33
33
 
34
34
  # Please send patches to <config-patches@gnu.org>. Submit a context
35
- # diff and a properly formatted ChangeLog entry.
35
+ # diff and a properly formatted GNU ChangeLog entry.
36
36
  #
37
37
  # Configuration subroutine to validate and canonicalize a configuration type.
38
38
  # Supply the specified configuration type as an argument.
39
39
  # If it is invalid, we print an error message on stderr and exit with code 1.
40
40
  # Otherwise, we print the canonical config type on stdout and succeed.
41
41
 
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
+
42
45
  # This file is supposed to be the same for all GNU packages
43
46
  # and recognize all the CPU types, system types and aliases
44
47
  # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
72
75
  version="\
73
76
  GNU config.sub ($timestamp)
74
77
 
75
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
76
- Free Software Foundation, Inc.
78
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
79
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
80
+ Software Foundation, Inc.
77
81
 
78
82
  This is free software; see the source for copying conditions. There is NO
79
83
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,8 +124,10 @@ esac
120
124
  # Here we must recognize all the valid KERNEL-OS combinations.
121
125
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
122
126
  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* | \
127
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
128
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
129
+ knetbsd*-gnu* | netbsd*-gnu* | \
130
+ kopensolaris*-gnu* | \
125
131
  storm-chaos* | os2-emx* | rtmk-nova*)
126
132
  os=-$maybe_os
127
133
  basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -148,10 +154,13 @@ case $os in
148
154
  -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149
155
  -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150
156
  -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151
- -apple | -axis | -knuth | -cray)
157
+ -apple | -axis | -knuth | -cray | -microblaze)
152
158
  os=
153
159
  basic_machine=$1
154
160
  ;;
161
+ -bluegene*)
162
+ os=-cnk
163
+ ;;
155
164
  -sim | -cisco | -oki | -wec | -winbond)
156
165
  os=
157
166
  basic_machine=$1
@@ -166,10 +175,10 @@ case $os in
166
175
  os=-chorusos
167
176
  basic_machine=$1
168
177
  ;;
169
- -chorusrdb)
170
- os=-chorusrdb
178
+ -chorusrdb)
179
+ os=-chorusrdb
171
180
  basic_machine=$1
172
- ;;
181
+ ;;
173
182
  -hiux*)
174
183
  os=-hiuxwe2
175
184
  ;;
@@ -249,13 +258,16 @@ case $basic_machine in
249
258
  | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
250
259
  | i370 | i860 | i960 | ia64 \
251
260
  | ip2k | iq2000 \
261
+ | lm32 \
252
262
  | m32c | m32r | m32rle | m68000 | m68k | m88k \
253
- | maxq | mb | microblaze | mcore | mep \
263
+ | maxq | mb | microblaze | mcore | mep | metag \
254
264
  | mips | mipsbe | mipseb | mipsel | mipsle \
255
265
  | mips16 \
256
266
  | mips64 | mips64el \
257
- | mips64vr | mips64vrel \
267
+ | mips64octeon | mips64octeonel \
258
268
  | mips64orion | mips64orionel \
269
+ | mips64r5900 | mips64r5900el \
270
+ | mips64vr | mips64vrel \
259
271
  | mips64vr4100 | mips64vr4100el \
260
272
  | mips64vr4300 | mips64vr4300el \
261
273
  | mips64vr5000 | mips64vr5000el \
@@ -268,28 +280,42 @@ case $basic_machine in
268
280
  | mipsisa64sr71k | mipsisa64sr71kel \
269
281
  | mipstx39 | mipstx39el \
270
282
  | mn10200 | mn10300 \
283
+ | moxie \
271
284
  | mt \
272
285
  | msp430 \
286
+ | nds32 | nds32le | nds32be \
273
287
  | nios | nios2 \
274
288
  | ns16k | ns32k \
289
+ | open8 \
275
290
  | or32 \
276
291
  | pdp10 | pdp11 | pj | pjl \
277
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
292
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
278
293
  | pyramid \
294
+ | rx \
279
295
  | score \
280
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
296
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
281
297
  | sh64 | sh64le \
282
298
  | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
283
299
  | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
284
- | spu | strongarm \
285
- | tahoe | thumb | tic4x | tic80 | tron \
300
+ | spu \
301
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
302
+ | ubicom32 \
286
303
  | v850 | v850e \
287
304
  | we32k \
288
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
289
- | z8k)
305
+ | x86 | xc16x | xstormy16 | xtensa \
306
+ | z8k | z80)
290
307
  basic_machine=$basic_machine-unknown
291
308
  ;;
292
- m6811 | m68hc11 | m6812 | m68hc12)
309
+ c54x)
310
+ basic_machine=tic54x-unknown
311
+ ;;
312
+ c55x)
313
+ basic_machine=tic55x-unknown
314
+ ;;
315
+ c6x)
316
+ basic_machine=tic6x-unknown
317
+ ;;
318
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
293
319
  # Motorola 68HC11/12.
294
320
  basic_machine=$basic_machine-unknown
295
321
  os=-none
@@ -300,6 +326,18 @@ case $basic_machine in
300
326
  basic_machine=mt-unknown
301
327
  ;;
302
328
 
329
+ strongarm | thumb | xscale)
330
+ basic_machine=arm-unknown
331
+ ;;
332
+
333
+ xscaleeb)
334
+ basic_machine=armeb-unknown
335
+ ;;
336
+
337
+ xscaleel)
338
+ basic_machine=armel-unknown
339
+ ;;
340
+
303
341
  # We use `pc' rather than `unknown'
304
342
  # because (1) that's what they normally are, and
305
343
  # (2) the word "unknown" tends to confuse beginning users.
@@ -320,7 +358,7 @@ case $basic_machine in
320
358
  | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
321
359
  | avr-* | avr32-* \
322
360
  | bfin-* | bs2000-* \
323
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
361
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
324
362
  | clipper-* | craynv-* | cydra-* \
325
363
  | d10v-* | d30v-* | dlx-* \
326
364
  | elxsi-* \
@@ -329,14 +367,17 @@ case $basic_machine in
329
367
  | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
330
368
  | i*86-* | i860-* | i960-* | ia64-* \
331
369
  | ip2k-* | iq2000-* \
370
+ | lm32-* \
332
371
  | m32c-* | m32r-* | m32rle-* \
333
372
  | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
334
- | m88110-* | m88k-* | maxq-* | mcore-* \
373
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
335
374
  | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
336
375
  | mips16-* \
337
376
  | mips64-* | mips64el-* \
338
- | mips64vr-* | mips64vrel-* \
377
+ | mips64octeon-* | mips64octeonel-* \
339
378
  | mips64orion-* | mips64orionel-* \
379
+ | mips64r5900-* | mips64r5900el-* \
380
+ | mips64vr-* | mips64vrel-* \
340
381
  | mips64vr4100-* | mips64vr4100el-* \
341
382
  | mips64vr4300-* | mips64vr4300el-* \
342
383
  | mips64vr5000-* | mips64vr5000el-* \
@@ -351,27 +392,35 @@ case $basic_machine in
351
392
  | mmix-* \
352
393
  | mt-* \
353
394
  | msp430-* \
395
+ | nds32-* | nds32le-* | nds32be-* \
354
396
  | nios-* | nios2-* \
355
397
  | none-* | np1-* | ns16k-* | ns32k-* \
398
+ | open8-* \
356
399
  | orion-* \
357
400
  | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
358
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
401
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
359
402
  | pyramid-* \
360
- | romp-* | rs6000-* \
361
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
403
+ | romp-* | rs6000-* | rx-* \
404
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
362
405
  | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
363
406
  | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
364
407
  | sparclite-* \
365
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
366
- | tahoe-* | thumb-* \
408
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
409
+ | tahoe-* \
367
410
  | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
411
+ | tile-* | tilegx-* \
368
412
  | tron-* \
413
+ | ubicom32-* \
369
414
  | v850-* | v850e-* | vax-* \
370
415
  | we32k-* \
371
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
372
- | xstormy16-* | xtensa-* \
416
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
417
+ | xstormy16-* | xtensa*-* \
373
418
  | ymp-* \
374
- | z8k-*)
419
+ | z8k-* | z80-*)
420
+ ;;
421
+ # Recognize the basic CPU types without company name, with glob match.
422
+ xtensa*)
423
+ basic_machine=$basic_machine-unknown
375
424
  ;;
376
425
  # Recognize the various machine names and aliases which stand
377
426
  # for a CPU type and a company and sometimes even an OS.
@@ -389,7 +438,7 @@ case $basic_machine in
389
438
  basic_machine=a29k-amd
390
439
  os=-udi
391
440
  ;;
392
- abacus)
441
+ abacus)
393
442
  basic_machine=abacus-unknown
394
443
  ;;
395
444
  adobe68k)
@@ -435,6 +484,10 @@ case $basic_machine in
435
484
  basic_machine=m68k-apollo
436
485
  os=-bsd
437
486
  ;;
487
+ aros)
488
+ basic_machine=i386-pc
489
+ os=-aros
490
+ ;;
438
491
  aux)
439
492
  basic_machine=m68k-apple
440
493
  os=-aux
@@ -443,10 +496,35 @@ case $basic_machine in
443
496
  basic_machine=ns32k-sequent
444
497
  os=-dynix
445
498
  ;;
499
+ blackfin)
500
+ basic_machine=bfin-unknown
501
+ os=-linux
502
+ ;;
503
+ blackfin-*)
504
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
505
+ os=-linux
506
+ ;;
507
+ bluegene*)
508
+ basic_machine=powerpc-ibm
509
+ os=-cnk
510
+ ;;
511
+ c54x-*)
512
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
513
+ ;;
514
+ c55x-*)
515
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
516
+ ;;
517
+ c6x-*)
518
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
519
+ ;;
446
520
  c90)
447
521
  basic_machine=c90-cray
448
522
  os=-unicos
449
523
  ;;
524
+ cegcc)
525
+ basic_machine=arm-unknown
526
+ os=-cegcc
527
+ ;;
450
528
  convex-c1)
451
529
  basic_machine=c1-convex
452
530
  os=-bsd
@@ -475,7 +553,7 @@ case $basic_machine in
475
553
  basic_machine=craynv-cray
476
554
  os=-unicosmp
477
555
  ;;
478
- cr16)
556
+ cr16 | cr16-*)
479
557
  basic_machine=cr16-unknown
480
558
  os=-elf
481
559
  ;;
@@ -514,6 +592,10 @@ case $basic_machine in
514
592
  basic_machine=m88k-motorola
515
593
  os=-sysv3
516
594
  ;;
595
+ dicos)
596
+ basic_machine=i686-pc
597
+ os=-dicos
598
+ ;;
517
599
  djgpp)
518
600
  basic_machine=i586-pc
519
601
  os=-msdosdjgpp
@@ -668,6 +750,14 @@ case $basic_machine in
668
750
  basic_machine=m68k-isi
669
751
  os=-sysv
670
752
  ;;
753
+ m68knommu)
754
+ basic_machine=m68k-unknown
755
+ os=-linux
756
+ ;;
757
+ m68knommu-*)
758
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
759
+ os=-linux
760
+ ;;
671
761
  m88k-omron*)
672
762
  basic_machine=m88k-omron
673
763
  ;;
@@ -679,6 +769,9 @@ case $basic_machine in
679
769
  basic_machine=ns32k-utek
680
770
  os=-sysv
681
771
  ;;
772
+ microblaze)
773
+ basic_machine=microblaze-xilinx
774
+ ;;
682
775
  mingw32)
683
776
  basic_machine=i386-pc
684
777
  os=-mingw32
@@ -783,6 +876,12 @@ case $basic_machine in
783
876
  np1)
784
877
  basic_machine=np1-gould
785
878
  ;;
879
+ neo-tandem)
880
+ basic_machine=neo-tandem
881
+ ;;
882
+ nse-tandem)
883
+ basic_machine=nse-tandem
884
+ ;;
786
885
  nsr-tandem)
787
886
  basic_machine=nsr-tandem
788
887
  ;;
@@ -813,6 +912,14 @@ case $basic_machine in
813
912
  basic_machine=i860-intel
814
913
  os=-osf
815
914
  ;;
915
+ parisc)
916
+ basic_machine=hppa-unknown
917
+ os=-linux
918
+ ;;
919
+ parisc-*)
920
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
921
+ os=-linux
922
+ ;;
816
923
  pbd)
817
924
  basic_machine=sparc-tti
818
925
  ;;
@@ -857,9 +964,10 @@ case $basic_machine in
857
964
  ;;
858
965
  power) basic_machine=power-ibm
859
966
  ;;
860
- ppc) basic_machine=powerpc-unknown
967
+ ppc | ppcbe) basic_machine=powerpc-unknown
861
968
  ;;
862
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
969
+ ppc-* | ppcbe-*)
970
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
863
971
  ;;
864
972
  ppcle | powerpclittle | ppc-le | powerpc-little)
865
973
  basic_machine=powerpcle-unknown
@@ -953,6 +1061,9 @@ case $basic_machine in
953
1061
  basic_machine=i860-stratus
954
1062
  os=-sysv4
955
1063
  ;;
1064
+ strongarm-* | thumb-*)
1065
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1066
+ ;;
956
1067
  sun2)
957
1068
  basic_machine=m68000-sun
958
1069
  ;;
@@ -1009,17 +1120,14 @@ case $basic_machine in
1009
1120
  basic_machine=t90-cray
1010
1121
  os=-unicos
1011
1122
  ;;
1012
- tic54x | c54x*)
1013
- basic_machine=tic54x-unknown
1014
- os=-coff
1123
+ # This must be matched before tile*.
1124
+ tilegx*)
1125
+ basic_machine=tilegx-unknown
1126
+ os=-linux-gnu
1015
1127
  ;;
1016
- tic55x | c55x*)
1017
- basic_machine=tic55x-unknown
1018
- os=-coff
1019
- ;;
1020
- tic6x | c6x*)
1021
- basic_machine=tic6x-unknown
1022
- os=-coff
1128
+ tile*)
1129
+ basic_machine=tile-unknown
1130
+ os=-linux-gnu
1023
1131
  ;;
1024
1132
  tx39)
1025
1133
  basic_machine=mipstx39-unknown
@@ -1088,6 +1196,9 @@ case $basic_machine in
1088
1196
  xps | xps100)
1089
1197
  basic_machine=xps100-honeywell
1090
1198
  ;;
1199
+ xscale-* | xscalee[bl]-*)
1200
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1201
+ ;;
1091
1202
  ymp)
1092
1203
  basic_machine=ymp-cray
1093
1204
  os=-unicos
@@ -1096,6 +1207,10 @@ case $basic_machine in
1096
1207
  basic_machine=z8k-unknown
1097
1208
  os=-sim
1098
1209
  ;;
1210
+ z80-*-coff)
1211
+ basic_machine=z80-unknown
1212
+ os=-sim
1213
+ ;;
1099
1214
  none)
1100
1215
  basic_machine=none-none
1101
1216
  os=-none
@@ -1134,7 +1249,7 @@ case $basic_machine in
1134
1249
  we32k)
1135
1250
  basic_machine=we32k-att
1136
1251
  ;;
1137
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1252
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1138
1253
  basic_machine=sh-unknown
1139
1254
  ;;
1140
1255
  sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1181,9 +1296,12 @@ esac
1181
1296
  if [ x"$os" != x"" ]
1182
1297
  then
1183
1298
  case $os in
1184
- # First match some system type aliases
1185
- # that might get confused with valid system types.
1299
+ # First match some system type aliases
1300
+ # that might get confused with valid system types.
1186
1301
  # -solaris* is a basic system type, with this one exception.
1302
+ -auroraux)
1303
+ os=-auroraux
1304
+ ;;
1187
1305
  -solaris1 | -solaris1.*)
1188
1306
  os=`echo $os | sed -e 's|solaris1|sunos4|'`
1189
1307
  ;;
@@ -1204,10 +1322,11 @@ case $os in
1204
1322
  # Each alternative MUST END IN A *, to match a version number.
1205
1323
  # -sysv* is not here because it comes later, after sysvr4.
1206
1324
  -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1207
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1208
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1325
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1326
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1327
+ | -sym* | -kopensolaris* \
1209
1328
  | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1210
- | -aos* \
1329
+ | -aos* | -aros* \
1211
1330
  | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1212
1331
  | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1213
1332
  | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1216,9 +1335,10 @@ case $os in
1216
1335
  | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1217
1336
  | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1218
1337
  | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1219
- | -chorusos* | -chorusrdb* \
1338
+ | -chorusos* | -chorusrdb* | -cegcc* \
1220
1339
  | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1221
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1340
+ | -mingw32* | -linux-gnu* | -linux-android* \
1341
+ | -linux-newlib* | -linux-uclibc* \
1222
1342
  | -uxpv* | -beos* | -mpeix* | -udk* \
1223
1343
  | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1224
1344
  | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1226,7 +1346,7 @@ case $os in
1226
1346
  | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1227
1347
  | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1228
1348
  | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1229
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1349
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1230
1350
  # Remember, each alternative MUST END IN *, to match a version number.
1231
1351
  ;;
1232
1352
  -qnx*)
@@ -1265,7 +1385,7 @@ case $os in
1265
1385
  -opened*)
1266
1386
  os=-openedition
1267
1387
  ;;
1268
- -os400*)
1388
+ -os400*)
1269
1389
  os=-os400
1270
1390
  ;;
1271
1391
  -wince*)
@@ -1314,7 +1434,7 @@ case $os in
1314
1434
  -sinix*)
1315
1435
  os=-sysv4
1316
1436
  ;;
1317
- -tpf*)
1437
+ -tpf*)
1318
1438
  os=-tpf
1319
1439
  ;;
1320
1440
  -triton*)
@@ -1356,6 +1476,11 @@ case $os in
1356
1476
  -zvmoe)
1357
1477
  os=-zvmoe
1358
1478
  ;;
1479
+ -dicos*)
1480
+ os=-dicos
1481
+ ;;
1482
+ -nacl*)
1483
+ ;;
1359
1484
  -none)
1360
1485
  ;;
1361
1486
  *)
@@ -1378,10 +1503,10 @@ else
1378
1503
  # system, and we'll never get to this point.
1379
1504
 
1380
1505
  case $basic_machine in
1381
- score-*)
1506
+ score-*)
1382
1507
  os=-elf
1383
1508
  ;;
1384
- spu-*)
1509
+ spu-*)
1385
1510
  os=-elf
1386
1511
  ;;
1387
1512
  *-acorn)
@@ -1393,8 +1518,17 @@ case $basic_machine in
1393
1518
  arm*-semi)
1394
1519
  os=-aout
1395
1520
  ;;
1396
- c4x-* | tic4x-*)
1397
- os=-coff
1521
+ c4x-* | tic4x-*)
1522
+ os=-coff
1523
+ ;;
1524
+ tic54x-*)
1525
+ os=-coff
1526
+ ;;
1527
+ tic55x-*)
1528
+ os=-coff
1529
+ ;;
1530
+ tic6x-*)
1531
+ os=-coff
1398
1532
  ;;
1399
1533
  # This must come before the *-dec entry.
1400
1534
  pdp10-*)
@@ -1421,7 +1555,7 @@ case $basic_machine in
1421
1555
  m68*-cisco)
1422
1556
  os=-aout
1423
1557
  ;;
1424
- mep-*)
1558
+ mep-*)
1425
1559
  os=-elf
1426
1560
  ;;
1427
1561
  mips*-cisco)
@@ -1448,7 +1582,7 @@ case $basic_machine in
1448
1582
  *-ibm)
1449
1583
  os=-aix
1450
1584
  ;;
1451
- *-knuth)
1585
+ *-knuth)
1452
1586
  os=-mmixware
1453
1587
  ;;
1454
1588
  *-wec)
@@ -1553,7 +1687,7 @@ case $basic_machine in
1553
1687
  -sunos*)
1554
1688
  vendor=sun
1555
1689
  ;;
1556
- -aix*)
1690
+ -cnk*|-aix*)
1557
1691
  vendor=ibm
1558
1692
  ;;
1559
1693
  -beos*)