[pypy-commit] pypy default: merged upstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r64399:e59970e51fc5
Date: 2013-05-21 12:02 -0700
http://bitbucket.org/pypy/pypy/changeset/e59970e51fc5/

Log:	merged upstream

diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -124,12 +124,14 @@
 
     @entrypoint('main', [], c_name='pypy_init_threads')
     def pypy_init_threads():
-        os_thread.setup_threads(space)
-        rffi.aroundstate.before()
+        if space.config.objspace.usemodules.thread:
+            os_thread.setup_threads(space)
+            rffi.aroundstate.before()
 
     @entrypoint('main', [], c_name='pypy_thread_attach')
     def pypy_thread_attach():
-        rthread.gc_thread_start()
+        if space.config.objspace.usemodules.thread:
+            rthread.gc_thread_start()
 
     w_globals = space.newdict()
     space.setitem(w_globals, space.wrap('__builtins__'),