[pypy-commit] pypy default: Remove _detect_arm_cpu - no longer needed

[stefanor]

Author: Stefano Rivera <stefano at rivera.za.net>
Branch: 
Changeset: r64284:265780e12b1d
Date: 2013-05-18 19:46 +0200
http://bitbucket.org/pypy/pypy/changeset/265780e12b1d/

Log:	Remove _detect_arm_cpu - no longer needed

diff --git a/rpython/memory/gc/env.py b/rpython/memory/gc/env.py
--- a/rpython/memory/gc/env.py
+++ b/rpython/memory/gc/env.py
@@ -165,10 +165,6 @@
     else:
         data = ''.join(data)
         linepos = 0
-        # Currently on ARM-linux we won't find any information about caches in
-        # cpuinfo
-        if _detect_arm_cpu(data):
-            return -1
         while True:
             start = _findend(data, '\n' + label, linepos)
             if start < 0:
@@ -319,11 +315,6 @@
         pos += 1
     return pos
 
-def _detect_arm_cpu(data):
-    # check for the presence of a 'Processor' entry
-    p = _findend(data, 'Processor', 0)
-    return p >= 0 and _findend(data, 'ARMv', p) > 0
-
 # ---------- Darwin ----------
 
 sysctlbyname = rffi.llexternal('sysctlbyname',
diff --git a/rpython/memory/gc/test/test_env.py b/rpython/memory/gc/test/test_env.py
--- a/rpython/memory/gc/test/test_env.py
+++ b/rpython/memory/gc/test/test_env.py
@@ -165,12 +165,3 @@
 def test_estimate_best_nursery_size_linux2_arm():
     result = env.get_L2cache_linux2()
     assert result == -1
-
-def test__detect_arm():
-    assert env._detect_arm_cpu("Processor       : ARMv6-compatible processor rev 7 (v6l)")
-    assert not env._detect_arm_cpu("""\
-processor   : 0
-vendor_id   : GenuineIntel
-cpu family  : 6
-model       : 37
-""")