1 From 39b0c436c77555849da1e68cc8733c67183c291f Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Sat, 10 Dec 2016 18:35:04 +0100
4 Subject: [PATCH 22/23] build: restrict compiler options to supported
7 For Linux we currently only support the following architectures:
8 'x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64'
9 explicitly check for those architectures and also remove ARM hard float.
11 Change-Id: I7078530bc2a89b88c7049cc53e8bb3fbe5d75ca8
12 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
14 build_common/linux/SConscript | 11 +++--------
15 resource/csdk/connectivity/build/linux/SConscript | 11 +++--------
16 2 files changed, 6 insertions(+), 16 deletions(-)
18 --- a/build_common/linux/SConscript
19 +++ b/build_common/linux/SConscript
20 @@ -30,14 +30,9 @@ if target_arch in ['x86']:
21 elif target_arch in ['x86_64']:
22 env.AppendUnique(CCFLAGS = ['-m64'])
23 env.AppendUnique(LINKFLAGS = ['-m64'])
24 -elif target_arch in ['arm'] or target_arch.find('v5') > 0:
25 +elif target_arch in ['arm']:
26 env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
27 -elif target_arch.find('v7a-hard') > 0:
28 +elif target_arch in ['arm-v7a', 'armeabi-v7a']:
29 env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
30 - env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
31 - env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard'])
32 - env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard'])
33 -elif target_arch.find('v7a') > 0:
34 - env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
35 -elif target_arch.find('arm64') >= 0:
36 +elif target_arch.find('arm64') > 0:
37 env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
38 --- a/resource/csdk/connectivity/build/linux/SConscript
39 +++ b/resource/csdk/connectivity/build/linux/SConscript
40 @@ -29,14 +29,9 @@ if target_arch in ['x86']:
41 elif target_arch in ['x86_64']:
42 env.AppendUnique(CCFLAGS = ['-m64'])
43 env.AppendUnique(LINKFLAGS = ['-m64'])
44 -elif target_arch.find('v7a-hard') > 0:
45 - env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
46 - env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
47 - env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard'])
48 - env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard'])
49 -elif target_arch.find('v7a') > 0:
50 +elif target_arch in ['arm']:
51 + env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
52 +elif target_arch in ['arm-v7a', 'armeabi-v7a']:
53 env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
54 elif target_arch.find('arm64') > 0:
55 env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
57 - env.AppendUnique(CPPFLAGS = ['-march=armv5te'])