Author: fijal
Branch:
Changeset: r82296:a97d68a0f18d
Date: 2016-02-16 18:53 +0100
http://bitbucket.org/pypy/pypy/changeset/a97d68a0f18d/
Log: skip _vmprof on non-x86 platforms
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -36,13 +36,13 @@
"cStringIO", "thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
"binascii", "_multiprocessing", '_warnings', "_collections",
"_multibytecodec", "micronumpy", "_continuation", "_cffi_backend",
- "_csv", "cppyy", "_pypyjson", "_vmprof",
+ "_csv", "cppyy", "_pypyjson",
])
-#if ((sys.platform.startswith('linux') or sys.platform == 'darwin')
-# and os.uname()[4] == 'x86_64' and sys.maxint > 2**32):
- # it's not enough that we get x86_64
-# working_modules.add('_vmprof')
+from rpython.jit.backend import detect_cpu
+if detect_cpu.startswith('x86'):
+ working_modules.add('_vmprof')
+
translation_modules = default_modules.copy()
translation_modules.update([
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -7,8 +7,6 @@
from rpython.rtyper.tool import rffi_platform as platform
from rpython.rlib import rthread
-from rpython.jit.backend import detect_cpu
-
class VMProfPlatformUnsupported(Exception):
pass
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
