[pypy-commit] pypy default: hg merge

[Manuel Jacob]

Author: Manuel Jacob
Branch: 
Changeset: r64390:d03bb47c8b07
Date: 2013-05-21 15:08 +0200
http://bitbucket.org/pypy/pypy/changeset/d03bb47c8b07/

Log:	hg merge

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -344,7 +344,7 @@
             return
 
         @cpython_api([PyObject, PyObject, PyObject], rffi.INT_real,
-                     error=-1, external=True) # XXX should not be exported
+                     error=-1, external=False)
         @func_renamer("cpyext_tp_setattro_%s" % (typedef.name,))
         def slot_tp_setattro(space, w_self, w_name, w_value):
             if w_value is not None:
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
@@ -132,7 +132,7 @@
 # ---------- Linux2 ----------
 
 def get_L2cache_linux2():
-    arch = platform.machine()
+    arch = os.uname()[4]  # machine
     if arch.endswith('86') or arch == 'x86_64':
         return get_L2cache_linux2_cpuinfo()
     if arch in ('alpha', 'ppc', 'ppc64'):