Author: Remi Meier <[email protected]>
Branch: stmgc-c4
Changeset: r67871:47618ab473d1
Date: 2013-11-07 10:51 +0100
http://bitbucket.org/pypy/pypy/changeset/47618ab473d1/
Log: for buildbot: last commit wasn't enough, next try by making -Ojit
imply --stm
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -99,7 +99,7 @@
BoolOption("thread", "enable use of threading primitives",
default=False, cmdline="--thread"),
BoolOption("stm", "enable use of Software Transactional Memory",
- default=True, cmdline="--stm",
+ default=False, cmdline="--stm",
suggests=[("translation.gc", "stmgc")], # Boehm works too
requires=[("translation.thread", True),
("translation.continuation", False), # XXX for now
@@ -325,7 +325,7 @@
'mem': DEFL_GC + ' lowinline remove_asserts removetypeptr',
'2': DEFL_GC + ' extraopts',
'3': DEFL_GC + ' extraopts remove_asserts',
- 'jit': DEFL_GC + ' extraopts jit',
+ 'jit': 'stmgc extraopts jit stm',
}
def set_opt_level(config, level):
@@ -363,6 +363,8 @@
config.translation.suggest(jit=True)
elif word == 'removetypeptr':
config.translation.suggest(gcremovetypeptr=True)
+ elif word == 'stm':
+ config.translation.suggest(stm=True)
else:
raise ValueError(word)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
