From 3f773ec8b437bb24898d0db8f7d78307ded60981 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 10 Dec 2016 18:35:04 +0100 Subject: [PATCH] build: restrict compiler options to supported architectures For Linux we currently only support the following architectures: 'x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64' explicitly check for those architectures. There is not option with v7a-hard in os_arch_map so it is not possible to select this for target_arch, remove the options here because they are unused. Change-Id: I7078530bc2a89b88c7049cc53e8bb3fbe5d75ca8 Signed-off-by: Hauke Mehrtens Reviewed-on: https://gerrit.iotivity.org/gerrit/15433 Reviewed-by: Phil Coval Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- build_common/linux/SConscript | 11 +++-------- resource/csdk/connectivity/build/linux/SConscript | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/build_common/linux/SConscript b/build_common/linux/SConscript index ce7c042..4b9871f 100644 --- a/build_common/linux/SConscript +++ b/build_common/linux/SConscript @@ -54,14 +54,9 @@ if target_arch in ['x86']: elif target_arch in ['x86_64']: env.AppendUnique(CCFLAGS = ['-m64']) env.AppendUnique(LINKFLAGS = ['-m64']) -elif target_arch in ['arm'] or target_arch.find('v5') > 0: +elif target_arch in ['arm']: env.AppendUnique(CPPFLAGS = ['-march=armv5te']) -elif target_arch.find('v7a-hard') > 0: +elif target_arch in ['arm-v7a', 'armeabi-v7a']: env.AppendUnique(CPPFLAGS = ['-march=armv7-a']) - env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard']) - env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard']) - env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard']) -elif target_arch.find('v7a') > 0: - env.AppendUnique(CPPFLAGS = ['-march=armv7-a']) -elif target_arch.find('arm64') >= 0: +elif target_arch.find('arm64') > 0: env.AppendUnique(CPPFLAGS = ['-march=armv8-a']) diff --git a/resource/csdk/connectivity/build/linux/SConscript b/resource/csdk/connectivity/build/linux/SConscript index 448d606..94f27a9 100644 --- a/resource/csdk/connectivity/build/linux/SConscript +++ b/resource/csdk/connectivity/build/linux/SConscript @@ -29,14 +29,9 @@ if target_arch in ['x86']: elif target_arch in ['x86_64']: env.AppendUnique(CCFLAGS = ['-m64']) env.AppendUnique(LINKFLAGS = ['-m64']) -elif target_arch.find('v7a-hard') > 0: - env.AppendUnique(CPPFLAGS = ['-march=armv7-a']) - env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard']) - env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard']) - env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard']) -elif target_arch.find('v7a') > 0: +elif target_arch in ['arm']: + env.AppendUnique(CPPFLAGS = ['-march=armv5te']) +elif target_arch in ['arm-v7a', 'armeabi-v7a']: env.AppendUnique(CPPFLAGS = ['-march=armv7-a']) elif target_arch.find('arm64') > 0: env.AppendUnique(CPPFLAGS = ['-march=armv8-a']) -else: - env.AppendUnique(CPPFLAGS = ['-march=armv5te']) -- 2.7.4