Author: David Schneider <david.schnei...@picle.org> Branch: Changeset: r64425:bf86c92ce059 Date: 2013-05-22 09:11 +0000 http://bitbucket.org/pypy/pypy/changeset/bf86c92ce059/
Log: make shadowstack the default gcrootfinder for all builds except linux/x86 diff --git a/rpython/config/translationoption.py b/rpython/config/translationoption.py --- a/rpython/config/translationoption.py +++ b/rpython/config/translationoption.py @@ -13,9 +13,9 @@ DEFL_GC = "minimark" if sys.platform.startswith("linux"): - DEFL_ROOTFINDER_WITHJIT = "asmgcc" + DEFL_ROOTFINDER = "asmgcc" else: - DEFL_ROOTFINDER_WITHJIT = "shadowstack" + DEFL_ROOTFINDER = "shadowstack" IS_64_BITS = sys.maxint > 2147483647 @@ -89,7 +89,7 @@ ChoiceOption("gcrootfinder", "Strategy for finding GC Roots (framework GCs only)", ["n/a", "shadowstack", "asmgcc"], - "shadowstack", + DEFL_ROOTFINDER, cmdline="--gcrootfinder", requires={ "shadowstack": [("translation.gctransformer", "framework")], @@ -112,7 +112,7 @@ BoolOption("jit", "generate a JIT", default=False, suggests=[("translation.gc", DEFL_GC), - ("translation.gcrootfinder", DEFL_ROOTFINDER_WITHJIT), + ("translation.gcrootfinder", DEFL_ROOTFINDER), ("translation.list_comprehension_operations", True)]), ChoiceOption("jit_backend", "choose the backend for the JIT", ["auto", "x86", "x86-without-sse2", 'arm'], _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit