passenger 4.0.5 → 4.0.6

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (162) hide show
  1. data.tar.gz.asc +7 -7
  2. data/.travis.yml +1 -2
  3. data/CONTRIBUTING.md +20 -5
  4. data/CONTRIBUTORS +67 -0
  5. data/LICENSE +1 -1
  6. data/NEWS +48 -0
  7. data/Rakefile +2 -2
  8. data/bin/passenger-config +18 -0
  9. data/bin/passenger-install-apache2-module +2 -0
  10. data/bin/passenger-install-nginx-module +11 -12
  11. data/bin/passenger-memory-stats +2 -0
  12. data/bin/passenger-status +152 -69
  13. data/build/agents.rb +1 -5
  14. data/build/basics.rb +26 -13
  15. data/build/cplusplus_support.rb +9 -0
  16. data/build/debian.rb +129 -0
  17. data/build/documentation.rb +6 -2
  18. data/build/integration_tests.rb +13 -2
  19. data/build/misc.rb +16 -0
  20. data/build/packaging.rb +67 -51
  21. data/build/preprocessor.rb +314 -0
  22. data/build/test_basics.rb +1 -0
  23. data/{debian → debian.template}/README.Debian +0 -0
  24. data/{debian → debian.template}/changelog +131 -0
  25. data/debian.template/compat +1 -0
  26. data/debian.template/control +71 -0
  27. data/debian.template/copyright +385 -0
  28. data/debian.template/libapache2-mod-passenger.install +3 -0
  29. data/{debian → debian.template}/libapache2-mod-passenger.postinst +0 -0
  30. data/{debian → debian.template}/libapache2-mod-passenger.prerm +0 -0
  31. data/debian.template/locations.ini +12 -0
  32. data/debian.template/passenger.conf +4 -0
  33. data/{debian → debian.template}/passenger.load +0 -0
  34. data/debian.template/patches/series +0 -0
  35. data/debian.template/repack.sh +42 -0
  36. data/debian.template/ruby-passenger-dev.install +3 -0
  37. data/debian.template/ruby-passenger-doc.install +2 -0
  38. data/debian.template/ruby-passenger.docs +4 -0
  39. data/debian.template/ruby-passenger.install +11 -0
  40. data/debian.template/ruby-passenger.manpages +4 -0
  41. data/debian.template/rules.template +35 -0
  42. data/debian.template/source/format +1 -0
  43. data/debian.template/watch +3 -0
  44. data/dev/run_travis.sh +46 -46
  45. data/doc/Architectural overview.html +2 -2
  46. data/doc/Packaging.html +27 -18
  47. data/doc/Packaging.txt.md +27 -18
  48. data/doc/Security of user switching support.html +2 -2
  49. data/doc/Users guide Apache.html +881 -95
  50. data/doc/Users guide Apache.idmap.txt +48 -6
  51. data/doc/Users guide Apache.txt +13 -1
  52. data/doc/Users guide Nginx.html +1063 -190
  53. data/doc/Users guide Nginx.idmap.txt +89 -45
  54. data/doc/Users guide Nginx.txt +45 -0
  55. data/doc/Users guide Standalone.html +7 -7
  56. data/doc/users_guide_snippets/alternative_for_flying_passenger.txt +1 -0
  57. data/doc/users_guide_snippets/environment_variables.txt +221 -0
  58. data/doc/users_guide_snippets/installation.txt +66 -17
  59. data/doc/users_guide_snippets/support_information.txt +3 -3
  60. data/doc/users_guide_snippets/tips.txt +352 -40
  61. data/ext/common/Account.h +4 -3
  62. data/ext/common/AccountsDatabase.h +6 -6
  63. data/ext/common/AgentsStarter.h +1 -13
  64. data/ext/common/ApplicationPool2/DirectSpawner.h +4 -4
  65. data/ext/common/ApplicationPool2/DummySpawner.h +1 -1
  66. data/ext/common/ApplicationPool2/Group.h +9 -4
  67. data/ext/common/ApplicationPool2/Implementation.cpp +6 -1
  68. data/ext/common/ApplicationPool2/Options.h +65 -37
  69. data/ext/common/ApplicationPool2/Pool.h +91 -41
  70. data/ext/common/ApplicationPool2/Process.h +6 -6
  71. data/ext/common/ApplicationPool2/SmartSpawner.h +14 -14
  72. data/ext/common/ApplicationPool2/Socket.h +1 -1
  73. data/ext/common/ApplicationPool2/Spawner.h +24 -16
  74. data/ext/common/ApplicationPool2/SpawnerFactory.h +9 -1
  75. data/ext/common/ApplicationPool2/SuperGroup.h +1 -1
  76. data/ext/common/Constants.h +1 -1
  77. data/ext/common/Logging.cpp +12 -7
  78. data/ext/common/MessageServer.h +7 -12
  79. data/ext/common/MultiLibeio.cpp +5 -5
  80. data/ext/common/ResourceLocator.h +2 -6
  81. data/ext/common/ServerInstanceDir.h +37 -10
  82. data/ext/common/UnionStation.h +10 -10
  83. data/ext/common/Utils.cpp +30 -4
  84. data/ext/common/Utils.h +7 -0
  85. data/ext/common/Utils/BlockingQueue.h +2 -2
  86. data/ext/common/Utils/Lock.h +2 -2
  87. data/ext/common/Utils/MessagePassing.h +2 -2
  88. data/ext/common/Utils/Timer.h +4 -4
  89. data/ext/common/agents/HelperAgent/AgentOptions.h +2 -0
  90. data/ext/common/agents/HelperAgent/Main.cpp +57 -16
  91. data/ext/common/agents/HelperAgent/RequestHandler.h +4 -1
  92. data/ext/common/agents/LoggingAgent/AdminController.h +91 -0
  93. data/ext/common/agents/LoggingAgent/LoggingServer.h +46 -29
  94. data/ext/common/agents/LoggingAgent/Main.cpp +43 -16
  95. data/ext/common/agents/LoggingAgent/RemoteSender.h +7 -7
  96. data/ext/common/agents/Watchdog/AgentWatcher.cpp +11 -11
  97. data/ext/common/agents/Watchdog/LoggingAgentWatcher.cpp +3 -1
  98. data/ext/common/agents/Watchdog/Main.cpp +62 -0
  99. data/ext/libeio/config.guess +206 -167
  100. data/ext/libeio/config.sub +142 -68
  101. data/ext/libev/config.guess +304 -290
  102. data/ext/libev/config.sub +198 -77
  103. data/ext/nginx/config +4 -0
  104. data/ext/nginx/ngx_http_passenger_module.c +1 -0
  105. data/ext/oxt/implementation.cpp +4 -4
  106. data/lib/phusion_passenger.rb +14 -5
  107. data/lib/phusion_passenger/abstract_installer.rb +41 -0
  108. data/lib/phusion_passenger/admin_tools/server_instance.rb +48 -39
  109. data/lib/phusion_passenger/message_client.rb +31 -7
  110. data/lib/phusion_passenger/native_support.rb +35 -12
  111. data/lib/phusion_passenger/packaging.rb +16 -2
  112. data/lib/phusion_passenger/platform_info/binary_compatibility.rb +6 -31
  113. data/lib/phusion_passenger/platform_info/operating_system.rb +1 -1
  114. data/lib/phusion_passenger/preloader_shared_helpers.rb +3 -1
  115. data/lib/phusion_passenger/request_handler.rb +1 -1
  116. data/lib/phusion_passenger/standalone/command.rb +6 -6
  117. data/lib/phusion_passenger/standalone/main.rb +23 -8
  118. data/lib/phusion_passenger/standalone/package_runtime_command.rb +9 -5
  119. data/lib/phusion_passenger/standalone/runtime_installer.rb +9 -10
  120. data/lib/phusion_passenger/standalone/start_command.rb +20 -4
  121. data/resources/templates/installer_common/freebsd9_broken_cxx_runtime.txt.erb +19 -0
  122. data/resources/templates/installer_common/low_amount_of_memory_warning.txt.erb +22 -0
  123. data/resources/templates/standalone/config.erb +3 -2
  124. data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp +4 -4
  125. data/test/cxx/ApplicationPool2/PoolTest.cpp +1 -1
  126. data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp +7 -7
  127. data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +9 -9
  128. data/test/cxx/EventedBufferedInputTest.cpp +17 -17
  129. data/test/cxx/RequestHandlerTest.cpp +5 -5
  130. data/test/cxx/ServerInstanceDirTest.cpp +3 -1
  131. data/test/cxx/TestSupport.h +4 -4
  132. data/test/cxx/UnionStationTest.cpp +3 -1
  133. data/test/cxx/UtilsTest.cpp +2 -0
  134. data/test/integration_tests/apache2_tests.rb +2 -2
  135. data/test/integration_tests/native_packaging_spec.rb +170 -0
  136. data/test/ruby/spec_helper.rb +0 -1
  137. data/test/stub/apache2/httpd.conf.erb +1 -1
  138. data/test/stub/nginx/nginx.conf.erb +1 -0
  139. data/test/support/apache2_controller.rb +1 -1
  140. data/test/support/placebo-preloader.rb +1 -1
  141. data/test/support/test_helper.rb +5 -2
  142. metadata +32 -26
  143. metadata.gz.asc +7 -7
  144. data/debian/compat +0 -1
  145. data/debian/control +0 -49
  146. data/debian/copyright +0 -20
  147. data/debian/libapache2-mod-passenger.install +0 -1
  148. data/debian/passenger-common.install +0 -4
  149. data/debian/passenger.conf +0 -4
  150. data/debian/prerm +0 -2
  151. data/debian/rules +0 -37
  152. data/debian/watch +0 -3
  153. data/dev/googlecode_upload.py +0 -265
  154. data/ext/common/agents/HelperAgent/BacktracesServer.h +0 -60
  155. data/resources/templates/nginx/not_available_when_natively_packaged.txt.erb +0 -8
  156. data/test/stub/rails3.1/app/assets/javascripts/application.js +0 -9
  157. data/test/stub/rails3.2/app/assets/javascripts/application.js +0 -15
  158. data/test/stub/rails_apps/2.3/mycook/public/javascripts/application.js +0 -2
  159. data/test/stub/rails_apps/2.3/mycook/public/javascripts/controls.js +0 -963
  160. data/test/stub/rails_apps/2.3/mycook/public/javascripts/dragdrop.js +0 -973
  161. data/test/stub/rails_apps/2.3/mycook/public/javascripts/effects.js +0 -1128
  162. data/test/stub/rails_apps/2.3/mycook/public/javascripts/prototype.js +0 -4320
data/ext/libeio/config.sub CHANGED
@@ -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, 2007, 2008, 2009
5
- # Free Software Foundation, Inc.
4
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
+ # 2011, 2012 Free Software Foundation, Inc.
6
6
 
7
- timestamp='2009-11-20'
7
+ timestamp='2012-04-18'
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
@@ -21,9 +21,7 @@ timestamp='2009-11-20'
21
21
  # GNU General Public License for more details.
22
22
  #
23
23
  # 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.
24
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
27
25
  #
28
26
  # As a special exception to the GNU General Public License, if you
29
27
  # distribute this file as part of a program that contains a
@@ -75,8 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
75
73
  version="\
76
74
  GNU config.sub ($timestamp)
77
75
 
78
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
79
- 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
76
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
77
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78
+ Free Software Foundation, Inc.
80
79
 
81
80
  This is free software; see the source for copying conditions. There is NO
82
81
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,13 +122,18 @@ esac
123
122
  # Here we must recognize all the valid KERNEL-OS combinations.
124
123
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
125
124
  case $maybe_os in
126
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
127
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
125
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
126
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
127
+ knetbsd*-gnu* | netbsd*-gnu* | \
128
128
  kopensolaris*-gnu* | \
129
129
  storm-chaos* | os2-emx* | rtmk-nova*)
130
130
  os=-$maybe_os
131
131
  basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
132
132
  ;;
133
+ android-linux)
134
+ os=-linux-android
135
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
136
+ ;;
133
137
  *)
134
138
  basic_machine=`echo $1 | sed 's/-[^-]*$//'`
135
139
  if [ $basic_machine != $1 ]
@@ -156,8 +160,8 @@ case $os in
156
160
  os=
157
161
  basic_machine=$1
158
162
  ;;
159
- -bluegene*)
160
- os=-cnk
163
+ -bluegene*)
164
+ os=-cnk
161
165
  ;;
162
166
  -sim | -cisco | -oki | -wec | -winbond)
163
167
  os=
@@ -173,10 +177,10 @@ case $os in
173
177
  os=-chorusos
174
178
  basic_machine=$1
175
179
  ;;
176
- -chorusrdb)
177
- os=-chorusrdb
180
+ -chorusrdb)
181
+ os=-chorusrdb
178
182
  basic_machine=$1
179
- ;;
183
+ ;;
180
184
  -hiux*)
181
185
  os=-hiuxwe2
182
186
  ;;
@@ -221,6 +225,12 @@ case $os in
221
225
  -isc*)
222
226
  basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
223
227
  ;;
228
+ -lynx*178)
229
+ os=-lynxos178
230
+ ;;
231
+ -lynx*5)
232
+ os=-lynxos5
233
+ ;;
224
234
  -lynx*)
225
235
  os=-lynxos
226
236
  ;;
@@ -245,17 +255,22 @@ case $basic_machine in
245
255
  # Some are omitted here because they have special meanings below.
246
256
  1750a | 580 \
247
257
  | a29k \
258
+ | aarch64 | aarch64_be \
248
259
  | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
249
260
  | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
250
261
  | am33_2.0 \
251
262
  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
263
+ | be32 | be64 \
252
264
  | bfin \
253
265
  | c4x | clipper \
254
266
  | d10v | d30v | dlx | dsp16xx \
267
+ | epiphany \
255
268
  | fido | fr30 | frv \
256
269
  | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
270
+ | hexagon \
257
271
  | i370 | i860 | i960 | ia64 \
258
272
  | ip2k | iq2000 \
273
+ | le32 | le64 \
259
274
  | lm32 \
260
275
  | m32c | m32r | m32rle | m68000 | m68k | m88k \
261
276
  | maxq | mb | microblaze | mcore | mep | metag \
@@ -281,29 +296,39 @@ case $basic_machine in
281
296
  | moxie \
282
297
  | mt \
283
298
  | msp430 \
299
+ | nds32 | nds32le | nds32be \
284
300
  | nios | nios2 \
285
301
  | ns16k | ns32k \
302
+ | open8 \
286
303
  | or32 \
287
304
  | pdp10 | pdp11 | pj | pjl \
288
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
305
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
289
306
  | pyramid \
290
- | rx \
307
+ | rl78 | rx \
291
308
  | score \
292
309
  | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
293
310
  | sh64 | sh64le \
294
311
  | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
295
312
  | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
296
- | spu | strongarm \
297
- | tahoe | thumb | tic4x | tic80 | tron \
313
+ | spu \
314
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
298
315
  | ubicom32 \
299
- | v850 | v850e \
316
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
300
317
  | we32k \
301
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
318
+ | x86 | xc16x | xstormy16 | xtensa \
302
319
  | z8k | z80)
303
320
  basic_machine=$basic_machine-unknown
304
321
  ;;
305
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
306
- # Motorola 68HC11/12.
322
+ c54x)
323
+ basic_machine=tic54x-unknown
324
+ ;;
325
+ c55x)
326
+ basic_machine=tic55x-unknown
327
+ ;;
328
+ c6x)
329
+ basic_machine=tic6x-unknown
330
+ ;;
331
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
307
332
  basic_machine=$basic_machine-unknown
308
333
  os=-none
309
334
  ;;
@@ -313,6 +338,21 @@ case $basic_machine in
313
338
  basic_machine=mt-unknown
314
339
  ;;
315
340
 
341
+ strongarm | thumb | xscale)
342
+ basic_machine=arm-unknown
343
+ ;;
344
+ xgate)
345
+ basic_machine=$basic_machine-unknown
346
+ os=-none
347
+ ;;
348
+ xscaleeb)
349
+ basic_machine=armeb-unknown
350
+ ;;
351
+
352
+ xscaleel)
353
+ basic_machine=armel-unknown
354
+ ;;
355
+
316
356
  # We use `pc' rather than `unknown'
317
357
  # because (1) that's what they normally are, and
318
358
  # (2) the word "unknown" tends to confuse beginning users.
@@ -327,21 +367,25 @@ case $basic_machine in
327
367
  # Recognize the basic CPU types with company name.
328
368
  580-* \
329
369
  | a29k-* \
370
+ | aarch64-* | aarch64_be-* \
330
371
  | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
331
372
  | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
332
373
  | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
333
374
  | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
334
375
  | avr-* | avr32-* \
376
+ | be32-* | be64-* \
335
377
  | bfin-* | bs2000-* \
336
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
378
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
337
379
  | clipper-* | craynv-* | cydra-* \
338
380
  | d10v-* | d30v-* | dlx-* \
339
381
  | elxsi-* \
340
382
  | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
341
383
  | h8300-* | h8500-* \
342
384
  | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
385
+ | hexagon-* \
343
386
  | i*86-* | i860-* | i960-* | ia64-* \
344
387
  | ip2k-* | iq2000-* \
388
+ | le32-* | le64-* \
345
389
  | lm32-* \
346
390
  | m32c-* | m32r-* | m32rle-* \
347
391
  | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -367,25 +411,29 @@ case $basic_machine in
367
411
  | mmix-* \
368
412
  | mt-* \
369
413
  | msp430-* \
414
+ | nds32-* | nds32le-* | nds32be-* \
370
415
  | nios-* | nios2-* \
371
416
  | none-* | np1-* | ns16k-* | ns32k-* \
417
+ | open8-* \
372
418
  | orion-* \
373
419
  | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
374
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
420
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
375
421
  | pyramid-* \
376
- | romp-* | rs6000-* | rx-* \
422
+ | rl78-* | romp-* | rs6000-* | rx-* \
377
423
  | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
378
424
  | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
379
425
  | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
380
426
  | sparclite-* \
381
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
382
- | tahoe-* | thumb-* \
383
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
427
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
428
+ | tahoe-* \
429
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
430
+ | tile*-* \
384
431
  | tron-* \
385
432
  | ubicom32-* \
386
- | v850-* | v850e-* | vax-* \
433
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
434
+ | vax-* \
387
435
  | we32k-* \
388
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
436
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
389
437
  | xstormy16-* | xtensa*-* \
390
438
  | ymp-* \
391
439
  | z8k-* | z80-*)
@@ -410,7 +458,7 @@ case $basic_machine in
410
458
  basic_machine=a29k-amd
411
459
  os=-udi
412
460
  ;;
413
- abacus)
461
+ abacus)
414
462
  basic_machine=abacus-unknown
415
463
  ;;
416
464
  adobe68k)
@@ -480,11 +528,20 @@ case $basic_machine in
480
528
  basic_machine=powerpc-ibm
481
529
  os=-cnk
482
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
+ ;;
483
540
  c90)
484
541
  basic_machine=c90-cray
485
542
  os=-unicos
486
543
  ;;
487
- cegcc)
544
+ cegcc)
488
545
  basic_machine=arm-unknown
489
546
  os=-cegcc
490
547
  ;;
@@ -516,7 +573,7 @@ case $basic_machine in
516
573
  basic_machine=craynv-cray
517
574
  os=-unicosmp
518
575
  ;;
519
- cr16)
576
+ cr16 | cr16-*)
520
577
  basic_machine=cr16-unknown
521
578
  os=-elf
522
579
  ;;
@@ -674,7 +731,6 @@ case $basic_machine in
674
731
  i370-ibm* | ibm*)
675
732
  basic_machine=i370-ibm
676
733
  ;;
677
- # I'm not sure what "Sysv32" means. Should this be sysv3.2?
678
734
  i*86v32)
679
735
  basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
680
736
  os=-sysv32
@@ -732,7 +788,7 @@ case $basic_machine in
732
788
  basic_machine=ns32k-utek
733
789
  os=-sysv
734
790
  ;;
735
- microblaze)
791
+ microblaze)
736
792
  basic_machine=microblaze-xilinx
737
793
  ;;
738
794
  mingw32)
@@ -771,10 +827,18 @@ case $basic_machine in
771
827
  ms1-*)
772
828
  basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
773
829
  ;;
830
+ msys)
831
+ basic_machine=i386-pc
832
+ os=-msys
833
+ ;;
774
834
  mvs)
775
835
  basic_machine=i370-ibm
776
836
  os=-mvs
777
837
  ;;
838
+ nacl)
839
+ basic_machine=le32-unknown
840
+ os=-nacl
841
+ ;;
778
842
  ncr3000)
779
843
  basic_machine=i486-ncr
780
844
  os=-sysv4
@@ -839,6 +903,12 @@ case $basic_machine in
839
903
  np1)
840
904
  basic_machine=np1-gould
841
905
  ;;
906
+ neo-tandem)
907
+ basic_machine=neo-tandem
908
+ ;;
909
+ nse-tandem)
910
+ basic_machine=nse-tandem
911
+ ;;
842
912
  nsr-tandem)
843
913
  basic_machine=nsr-tandem
844
914
  ;;
@@ -921,9 +991,10 @@ case $basic_machine in
921
991
  ;;
922
992
  power) basic_machine=power-ibm
923
993
  ;;
924
- ppc) basic_machine=powerpc-unknown
994
+ ppc | ppcbe) basic_machine=powerpc-unknown
925
995
  ;;
926
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
996
+ ppc-* | ppcbe-*)
997
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
927
998
  ;;
928
999
  ppcle | powerpclittle | ppc-le | powerpc-little)
929
1000
  basic_machine=powerpcle-unknown
@@ -1017,6 +1088,9 @@ case $basic_machine in
1017
1088
  basic_machine=i860-stratus
1018
1089
  os=-sysv4
1019
1090
  ;;
1091
+ strongarm-* | thumb-*)
1092
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1093
+ ;;
1020
1094
  sun2)
1021
1095
  basic_machine=m68000-sun
1022
1096
  ;;
@@ -1073,20 +1147,8 @@ case $basic_machine in
1073
1147
  basic_machine=t90-cray
1074
1148
  os=-unicos
1075
1149
  ;;
1076
- tic54x | c54x*)
1077
- basic_machine=tic54x-unknown
1078
- os=-coff
1079
- ;;
1080
- tic55x | c55x*)
1081
- basic_machine=tic55x-unknown
1082
- os=-coff
1083
- ;;
1084
- tic6x | c6x*)
1085
- basic_machine=tic6x-unknown
1086
- os=-coff
1087
- ;;
1088
1150
  tile*)
1089
- basic_machine=tile-unknown
1151
+ basic_machine=$basic_machine-unknown
1090
1152
  os=-linux-gnu
1091
1153
  ;;
1092
1154
  tx39)
@@ -1156,6 +1218,9 @@ case $basic_machine in
1156
1218
  xps | xps100)
1157
1219
  basic_machine=xps100-honeywell
1158
1220
  ;;
1221
+ xscale-* | xscalee[bl]-*)
1222
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1223
+ ;;
1159
1224
  ymp)
1160
1225
  basic_machine=ymp-cray
1161
1226
  os=-unicos
@@ -1253,11 +1318,11 @@ esac
1253
1318
  if [ x"$os" != x"" ]
1254
1319
  then
1255
1320
  case $os in
1256
- # First match some system type aliases
1257
- # that might get confused with valid system types.
1321
+ # First match some system type aliases
1322
+ # that might get confused with valid system types.
1258
1323
  # -solaris* is a basic system type, with this one exception.
1259
- -auroraux)
1260
- os=-auroraux
1324
+ -auroraux)
1325
+ os=-auroraux
1261
1326
  ;;
1262
1327
  -solaris1 | -solaris1.*)
1263
1328
  os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1293,8 +1358,9 @@ case $os in
1293
1358
  | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1294
1359
  | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1295
1360
  | -chorusos* | -chorusrdb* | -cegcc* \
1296
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1297
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1361
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1362
+ | -mingw32* | -linux-gnu* | -linux-android* \
1363
+ | -linux-newlib* | -linux-uclibc* \
1298
1364
  | -uxpv* | -beos* | -mpeix* | -udk* \
1299
1365
  | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1300
1366
  | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1407,7 @@ case $os in
1341
1407
  -opened*)
1342
1408
  os=-openedition
1343
1409
  ;;
1344
- -os400*)
1410
+ -os400*)
1345
1411
  os=-os400
1346
1412
  ;;
1347
1413
  -wince*)
@@ -1390,7 +1456,7 @@ case $os in
1390
1456
  -sinix*)
1391
1457
  os=-sysv4
1392
1458
  ;;
1393
- -tpf*)
1459
+ -tpf*)
1394
1460
  os=-tpf
1395
1461
  ;;
1396
1462
  -triton*)
@@ -1435,6 +1501,8 @@ case $os in
1435
1501
  -dicos*)
1436
1502
  os=-dicos
1437
1503
  ;;
1504
+ -nacl*)
1505
+ ;;
1438
1506
  -none)
1439
1507
  ;;
1440
1508
  *)
@@ -1457,10 +1525,10 @@ else
1457
1525
  # system, and we'll never get to this point.
1458
1526
 
1459
1527
  case $basic_machine in
1460
- score-*)
1528
+ score-*)
1461
1529
  os=-elf
1462
1530
  ;;
1463
- spu-*)
1531
+ spu-*)
1464
1532
  os=-elf
1465
1533
  ;;
1466
1534
  *-acorn)
@@ -1472,8 +1540,17 @@ case $basic_machine in
1472
1540
  arm*-semi)
1473
1541
  os=-aout
1474
1542
  ;;
1475
- c4x-* | tic4x-*)
1476
- os=-coff
1543
+ c4x-* | tic4x-*)
1544
+ os=-coff
1545
+ ;;
1546
+ tic54x-*)
1547
+ os=-coff
1548
+ ;;
1549
+ tic55x-*)
1550
+ os=-coff
1551
+ ;;
1552
+ tic6x-*)
1553
+ os=-coff
1477
1554
  ;;
1478
1555
  # This must come before the *-dec entry.
1479
1556
  pdp10-*)
@@ -1493,14 +1570,11 @@ case $basic_machine in
1493
1570
  ;;
1494
1571
  m68000-sun)
1495
1572
  os=-sunos3
1496
- # This also exists in the configure program, but was not the
1497
- # default.
1498
- # os=-sunos4
1499
1573
  ;;
1500
1574
  m68*-cisco)
1501
1575
  os=-aout
1502
1576
  ;;
1503
- mep-*)
1577
+ mep-*)
1504
1578
  os=-elf
1505
1579
  ;;
1506
1580
  mips*-cisco)
@@ -1527,7 +1601,7 @@ case $basic_machine in
1527
1601
  *-ibm)
1528
1602
  os=-aix
1529
1603
  ;;
1530
- *-knuth)
1604
+ *-knuth)
1531
1605
  os=-mmixware
1532
1606
  ;;
1533
1607
  *-wec)