Author: Armin Rigo <[email protected]>
Branch:
Changeset: r71365:d899a8048351
Date: 2014-05-07 12:35 +0200
http://bitbucket.org/pypy/pypy/changeset/d899a8048351/
Log: Disable asmgcc on Win32 in the same way as it was done on OS/X.
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -17,13 +17,8 @@
if sys.platform.startswith("linux"):
DEFL_ROOTFINDER_WITHJIT = "asmgcc"
- ROOTFINDERS = ["n/a", "shadowstack", "asmgcc"]
-elif compiler.name == 'msvc':
- DEFL_ROOTFINDER_WITHJIT = "shadowstack"
- ROOTFINDERS = ["n/a", "shadowstack"]
else:
DEFL_ROOTFINDER_WITHJIT = "shadowstack"
- ROOTFINDERS = ["n/a", "shadowstack", "asmgcc"]
IS_64_BITS = sys.maxint > 2147483647
@@ -91,7 +86,7 @@
default=IS_64_BITS, cmdline="--gcremovetypeptr"),
ChoiceOption("gcrootfinder",
"Strategy for finding GC Roots (framework GCs only)",
- ROOTFINDERS,
+ ["n/a", "shadowstack", "asmgcc"],
"shadowstack",
cmdline="--gcrootfinder",
requires={
@@ -372,9 +367,10 @@
# if we have specified strange inconsistent settings.
config.translation.gc = config.translation.gc
- # disallow asmgcc on OS/X
+ # disallow asmgcc on OS/X and on Win32
if config.translation.gcrootfinder == "asmgcc":
- assert sys.platform != "darwin"
+ assert sys.platform != "darwin", "'asmgcc' not supported on OS/X"
+ assert sys.platform != "win32", "'asmgcc' not supported on Win32"
# ----------------------------------------------------------------
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
