Add hardfloat build support

Change-Id: I4bb99951d9627623caa3dfcac84769d16156ad41
Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/SConstruct b/SConstruct
index 274326f67953d22bfc53cc8c1387d1a2bdf66cab..4666041131a155b8fb1ce3d7fa7b91d3e48eee3a 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -43,7 +43,7 @@ vars.AddVariables(
     BoolVariable("asserts", "Enable asserts (this flag is forced to 1 for debug=1)", False),
     BoolVariable("logging", "Logging (this flag is forced to 1 for debug=1)", False),
     EnumVariable("arch", "Target Architecture", "armv7a",
-                  allowed_values=("armv7a", "arm64-v8a", "arm64-v8.2-a", "arm64-v8.2-a-sve", "arm64-v8.2-a-sve2", "x86_32", "x86_64",
+                  allowed_values=("armv7a", "armv7a-hf", "arm64-v8a", "arm64-v8.2-a", "arm64-v8.2-a-sve", "arm64-v8.2-a-sve2", "x86_32", "x86_64",
                                   "armv8a", "armv8.2-a", "armv8.2-a-sve", "armv8.6-a", "armv8.6-a-sve", "armv8.6-a-sve2", "armv8r64", "x86")),
     EnumVariable("estate", "Execution State", "auto", allowed_values=("auto", "32", "64")),
     EnumVariable("os", "Target OS", "linux", allowed_values=("linux", "android", "tizen", "macos", "bare_metal")),
@@ -207,7 +207,7 @@ if 'v7a' in env['estate'] and env['estate'] == '64':
 prefix = ""
 if 'v7a' in env['arch']:
     env.Append(CXXFLAGS = ['-march=armv7-a', '-mthumb', '-mfpu=neon'])
-    if env['os'] == 'android' or env['os'] == 'tizen':
+    if (env['os'] == 'android' or env['os'] == 'tizen') and not 'hf' in env['arch']:
         env.Append(CXXFLAGS = ['-mfloat-abi=softfp'])
     else:
         env.Append(CXXFLAGS = ['-mfloat-abi=hard'])

diff --git a/packaging/libarmcl.spec b/packaging/libarmcl.spec
index e3a30ef09fced24e1f4ece5447d5edd29fe76446..4739105e0bc3837298a16c4a46ae126a5ccffc90 100644 (file)
--- a/packaging/libarmcl.spec
+++ b/packaging/libarmcl.spec
@@ -15,7 +15,9 @@ BuildRequires: scons
 
 %define OPEN_CL_SUPPORT                1
 %define NEON_SUPPORT           1
+%ifnarch armv7hl
 %define BENCHMARK_TEST         1
+%endif
 
 %description
 The ARM Computer Vision and Machine Learning library is a set of functions optimised for both ARM CPUs and GPUs using SIMD technologies
@@ -58,8 +60,12 @@ scons -j8            \
        build=native    \
 %ifarch aarch64
        arch=arm64-v8a  \
-%else
+%endif
+%ifarch armv7l
        arch=armv7a     \
+%endif
+%ifarch armv7hl
+       arch=armv7a-hf
 %endif
        embed_kernels=1 \
 %if 0%{?BENCHMARK_TEST} == 1