[pypy-svn] r67763 - pypy/trunk/pypy/config

[arigo at codespeak.net]

Author: arigo
Date: Fri Sep 18 15:05:22 2009
New Revision: 67763

Added:
   pypy/trunk/pypy/config/translationoption.py.merge.tmp
      - copied, changed from r67762, pypy/trunk/pypy/config/translationoption.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/asmgcroot-callback/pypy/config/translationoption.py
revisions 67691 to 67762:

    ------------------------------------------------------------------------
    r67709 | arigo | 2009-09-16 11:21:10 +0200 (Wed, 16 Sep 2009) | 2 lines
    
    Small changes that seem to make threads work on top of asmgcc.
    
    ------------------------------------------------------------------------
    r67692 | arigo | 2009-09-15 15:38:22 +0200 (Tue, 15 Sep 2009) | 3 lines
    
    A branch in which to try to implement callback support
    in --gcrootfinder=asmgcc.
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/config/translationoption.py.merge.tmp (from r67762, pypy/trunk/pypy/config/translationoption.py)
==============================================================================
--- pypy/trunk/pypy/config/translationoption.py	(original)
+++ pypy/trunk/pypy/config/translationoption.py.merge.tmp	Fri Sep 18 15:05:22 2009
@@ -79,8 +79,7 @@
                  requires={
                      "shadowstack": [("translation.gctransformer", "framework")],
                      "asmgcc": [("translation.gctransformer", "framework"),
-                                ("translation.backend", "c"),
-                                ("translation.thread", False)],
+                                ("translation.backend", "c")],
                     }),
 
     # other noticeable options