Author: David Schneider <[email protected]>
Branch:
Changeset: r64453:84874bf5c723
Date: 2013-05-22 16:39 +0200
http://bitbucket.org/pypy/pypy/changeset/84874bf5c723/
Log: backout bf86c92ce059
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -18,9 +18,9 @@
_is_x86 = autodetect() in (MODEL_X86, MODEL_X86_64, MODEL_X86_NO_SSE2)
if sys.platform.startswith("linux") and _is_x86:
- DEFL_ROOTFINDER = "asmgcc"
+ DEFL_ROOTFINDER_WITHJIT = "asmgcc"
else:
- DEFL_ROOTFINDER = "shadowstack"
+ DEFL_ROOTFINDER_WITHJIT = "shadowstack"
IS_64_BITS = sys.maxint > 2147483647
@@ -94,7 +94,7 @@
ChoiceOption("gcrootfinder",
"Strategy for finding GC Roots (framework GCs only)",
["n/a", "shadowstack", "asmgcc"],
- DEFL_ROOTFINDER,
+ "shadowstack",
cmdline="--gcrootfinder",
requires={
"shadowstack": [("translation.gctransformer",
"framework")],
@@ -117,7 +117,7 @@
BoolOption("jit", "generate a JIT",
default=False,
suggests=[("translation.gc", DEFL_GC),
- ("translation.gcrootfinder", DEFL_ROOTFINDER),
+ ("translation.gcrootfinder", DEFL_ROOTFINDER_WITHJIT),
("translation.list_comprehension_operations", True)]),
ChoiceOption("jit_backend", "choose the backend for the JIT",
["auto", "x86", "x86-without-sse2", 'arm'],
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
