From 0247be267879f6b36a175d2f545a74bfd2c6ae25 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Mon, 4 Nov 2013 16:28:06 +0000 Subject: Add armhf detection --- morphlib/util.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/morphlib/util.py b/morphlib/util.py index 04df0633..d60c08c3 100644 --- a/morphlib/util.py +++ b/morphlib/util.py @@ -15,6 +15,7 @@ import os import re +import subprocess import morphlib import logging @@ -388,6 +389,11 @@ def parse_environment_pairs(env, pairs): return dict(env.items() + extra_env.items()) +def has_hardware_fp(): + output = subprocess.check_output(['readelf', '-A', '/proc/self/exe']) + return 'Tag_ABI_VFP_args: VFP registers' in output + + def get_host_architecture(): # pragma: no cover '''Get the canonical Morph name for the host's architecture.''' @@ -406,6 +412,9 @@ def get_host_architecture(): # pragma: no cover if machine not in table: raise morphlib.Error('Unknown host architecture %s' % machine) + if machine == 'armv7l' and has_hardware_fp(): + return 'armv7lhf' + return table[machine] -- cgit v1.2.1