[pypy-svn] r67769 - in pypy/trunk/pypy: config module/thread rlib rpython rpython/lltypesystem rpython/lltypesystem/test rpython/memory/gctransform translator/c translator/c/gcc translator/c/src translator/c/test

[arigo at codespeak.net]

Author: arigo
Date: Fri Sep 18 15:07:00 2009
New Revision: 67769

Added:
   pypy/trunk/pypy/config/translationoption.py
      - copied unchanged from r67768, pypy/trunk/pypy/config/translationoption.py.merge.tmp
   pypy/trunk/pypy/module/thread/
      - copied from r67768, pypy/branch/asmgcroot-callback/pypy/module/thread/
   pypy/trunk/pypy/rlib/objectmodel.py
      - copied unchanged from r67768, pypy/branch/asmgcroot-callback/pypy/rlib/objectmodel.py
   pypy/trunk/pypy/rpython/llinterp.py
      - copied unchanged from r67768, pypy/trunk/pypy/rpython/llinterp.py.merge.tmp
   pypy/trunk/pypy/rpython/lltypesystem/lloperation.py
      - copied unchanged from r67768, pypy/trunk/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
   pypy/trunk/pypy/rpython/lltypesystem/opimpl.py
      - copied unchanged from r67768, pypy/branch/asmgcroot-callback/pypy/rpython/lltypesystem/opimpl.py
   pypy/trunk/pypy/rpython/lltypesystem/rffi.py
      - copied unchanged from r67768, pypy/branch/asmgcroot-callback/pypy/rpython/lltypesystem/rffi.py
   pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py
      - copied unchanged from r67768, pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp
   pypy/trunk/pypy/rpython/memory/gctransform/asmgcroot.py
      - copied unchanged from r67768, pypy/branch/asmgcroot-callback/pypy/rpython/memory/gctransform/asmgcroot.py
   pypy/trunk/pypy/rpython/memory/gctransform/framework.py
      - copied unchanged from r67768, pypy/trunk/pypy/rpython/memory/gctransform/framework.py.merge.tmp
   pypy/trunk/pypy/translator/c/funcgen.py
      - copied unchanged from r67768, pypy/branch/asmgcroot-callback/pypy/translator/c/funcgen.py
   pypy/trunk/pypy/translator/c/gc.py
      - copied unchanged from r67768, pypy/trunk/pypy/translator/c/gc.py.merge.tmp
   pypy/trunk/pypy/translator/c/gcc/
      - copied from r67768, pypy/branch/asmgcroot-callback/pypy/translator/c/gcc/
   pypy/trunk/pypy/translator/c/src/
      - copied from r67768, pypy/branch/asmgcroot-callback/pypy/translator/c/src/
   pypy/trunk/pypy/translator/c/test/test_standalone.py
      - copied unchanged from r67768, pypy/branch/asmgcroot-callback/pypy/translator/c/test/test_standalone.py
Removed:
   pypy/trunk/pypy/config/translationoption.py.merge.tmp
   pypy/trunk/pypy/rpython/llinterp.py.merge.tmp
   pypy/trunk/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
   pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp
   pypy/trunk/pypy/rpython/memory/gctransform/framework.py.merge.tmp
   pypy/trunk/pypy/translator/c/gc.py.merge.tmp
Log:
Merge 'asmgcroot-callback':

This finishes the --gcrootfinder=asmgcc support on x86,
by being safe against callbacks and threads.