[pypy-commit] pypy default: update arm platform libffi configuration

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r63105:8bfec0fa1e69
Date: 2013-04-06 21:19 +0200
http://bitbucket.org/pypy/pypy/changeset/8bfec0fa1e69/

Log:	update arm platform libffi configuration

diff --git a/rpython/jit/tl/tla/tla_assembler.py b/rpython/jit/tl/tla/tla_assembler.py
--- a/rpython/jit/tl/tla/tla_assembler.py
+++ b/rpython/jit/tl/tla/tla_assembler.py
@@ -2,8 +2,8 @@
 
 import sys
 import py
+from rpython.jit.tl.tla.test_tla import assemble
 py.path.local(__file__)
-from rpython.jit.tl.tla.test_tla import assemble
 
 def usage():
     print >> sys.stderr, 'Usage: tla_assembler.py filename.tla.py'
diff --git a/rpython/translator/platform/arm.py b/rpython/translator/platform/arm.py
--- a/rpython/translator/platform/arm.py
+++ b/rpython/translator/platform/arm.py
@@ -47,11 +47,12 @@
         return ExecutionResult(returncode, stdout, stderr)
 
     def include_dirs_for_libffi(self):
-        return [SB2 + '/usr/include/arm-linux-gnueabi/']
+        return [SB2 + '/usr/include/arm-linux-gnueabi/',
+		SB2 + '/usr/include/arm-linux-gnueabihf/']
 
     def library_dirs_for_libffi(self):
-        # on the other hand, library lands in usual place...
-        return []
+        return [SB2 + '/usr/lib/arm-linux-gnueabi/',
+		SB2 + '/usr/lib/arm-linux-gnueabihf/']
 
     def execute_makefile(self, path_to_makefile, extra_opts=[]):
         if isinstance(path_to_makefile, GnuMakefile):