Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r79715:f0bd5bbe701a
Date: 2015-09-20 10:07 +0200
http://bitbucket.org/pypy/pypy/changeset/f0bd5bbe701a/
Log: merge
diff --git a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
--- a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
@@ -47,7 +47,7 @@
i31 = getfield_gc_pure_i(p1, descr=<FieldS
pypy.module.micronumpy.iterators.ArrayIter.inst_size \d+>)
i32 = int_ge(i25, i31)
guard_false(i32, descr=...)
- p34 = new_with_vtable(#)
+ p34 = new_with_vtable(descr=...)
{{{
setfield_gc(p34, p1, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst_iterator \d+>)
setfield_gc(p34, i25, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_index \d+>)
@@ -154,7 +154,7 @@
f86 = float_add(f74, f85)
i87 = int_add(i76, 1)
--TICK--
- jump(p0, p1, p6, p7, p8, p11, p13, f86, p17, i87, i62, p42, i58,
p48, i41, i64, i70, descr=...)
+ jump(..., descr=...)
""")
def test_array_flatiter_next(self):
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -16,10 +16,11 @@
DEFL_GC = "incminimark" # XXX
+DEFL_ROOTFINDER_WITHJIT = "shadowstack"
if sys.platform.startswith("linux"):
- DEFL_ROOTFINDER_WITHJIT = "asmgcc"
-else:
- DEFL_ROOTFINDER_WITHJIT = "shadowstack"
+ _mach = os.popen('uname -m', 'r').read().strip()
+ if _mach.startswith('x86') or _mach in ['i386', 'i486', 'i586', 'i686']:
+ DEFL_ROOTFINDER_WITHJIT = "asmgcc" # only for Linux on x86 / x86-64
IS_64_BITS = sys.maxint > 2147483647
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
