[pypy-commit] pypy default: The JIT detect_cpu function throws exceptions on some CPUs (that don't support JIT), so it can't be used in non-JIT contexts

[stefanor]

Author: Stefano Rivera <stefano at rivera.za.net>
Branch: 
Changeset: r83529:2179c165ab7b
Date: 2016-04-05 15:11 -0700
http://bitbucket.org/pypy/pypy/changeset/2179c165ab7b/

Log:	The JIT detect_cpu function throws exceptions on some CPUs (that
	don't support JIT), so it can't be used in non-JIT contexts

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
@@ -1,3 +1,4 @@
+import platform as host_platform
 import py
 import sys
 from rpython.tool.udir import udir
@@ -28,8 +29,7 @@
 
 
 def setup():
-    from rpython.jit.backend import detect_cpu
-    if detect_cpu.autodetect().startswith(detect_cpu.MODEL_S390_64):
+    if host_platform.machine() == 's390x':
         raise VMProfPlatformUnsupported("rvmprof not supported on"
                                         " s390x CPUs for now")
     compile_extra = ['-DRPYTHON_LL2CTYPES']