Author: Remi Meier <remi.me...@inf.ethz.ch>
Branch: stmgc-c8
Changeset: r75481:52a66fc6dc00
Date: 2015-01-22 11:24 +0100
http://bitbucket.org/pypy/pypy/changeset/52a66fc6dc00/
Log: fix for c8's prebuilt-setup
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -788,7 +788,7 @@
database, database.translator.rtyper)
for line in preimplementationlines:
print >> f, line
- f.write('#endif /* _PY_PREIMPL_H */\n')
+ f.write('#endif /* _PY_PREIMPL_H */\n')
def gen_startupcode(f, database):
# generate the start-up code and put it into a function
@@ -806,7 +806,6 @@
if database.with_stm:
print >> f, '\tpypy_stm_setup();'
- print >> f, '\tpypy_stm_setup_prebuilt();'
for line in database.gcpolicy.gc_startup_code():
print >> f,"\t" + line
diff --git a/rpython/translator/stm/src_stm/stmgcintf.c
b/rpython/translator/stm/src_stm/stmgcintf.c
--- a/rpython/translator/stm/src_stm/stmgcintf.c
+++ b/rpython/translator/stm/src_stm/stmgcintf.c
@@ -88,6 +88,8 @@
void pypy_stm_setup(void)
{
stm_setup();
+ pypy_stm_setup_prebuilt();
+
pypy_stm_register_thread_local();
pypy_stm_ready_atomic = 1;
/* set transaction length to unlimited until the first thread
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
