build: avoid to use ARMv5 machine flags by default

To use this flags it is encouraged to set TARGET_ARCH to "*v5*" from.
If unset, generic (buildsystem)'s flags will be used as expected.

I noticed this while building with Tizen:2.4:Mobile toolchain (gbs)
but it could also affect other ports or build infrastructures.

Bug: https://jira.iotivity.org/browse/IOT-694
Change-Id: I4bc279e809474bf664b4825f201df471c66a191c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4541
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/build_common/linux/SConscript b/build_common/linux/SConscript
index 2cb51b5b60b4822b6763037cec890de16fb0c39f..6a9393b79d3702d31311725664efde0f8d534b73 100644 (file)
--- a/build_common/linux/SConscript
+++ b/build_common/linux/SConscript
@@ -22,7 +22,7 @@ env.AppendUnique(CCFLAGS = ['-Wall', '-Wextra', '-fPIC'])
 env.AppendUnique(LIBS = ['uuid'])
 env.AppendUnique(LINKFLAGS = ['-ldl', '-lpthread'])
 
-# Set arch flags
+# Set arch flags that match best TARGET_ARCH variable
 target_arch = env.get('TARGET_ARCH')
 if target_arch in ['x86']:
        env.AppendUnique(CCFLAGS = ['-m32'])
@@ -30,6 +30,8 @@ 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:
+       env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
 elif target_arch.find('v7a-hard') > 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
        env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
@@ -39,5 +41,3 @@ elif target_arch.find('v7a') > 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
 elif target_arch.find('arm64') >= 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
-else:
-       env.AppendUnique(CPPFLAGS = ['-march=armv5te'])

diff --git a/build_common/tizen/SConscript b/build_common/tizen/SConscript
index 4885b572213b104782252cfe4ffe703c2ee5749e..69de960230f2c12ec39997fb678aa3872c831471 100644 (file)
--- a/build_common/tizen/SConscript
+++ b/build_common/tizen/SConscript
@@ -33,6 +33,8 @@ 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:
+       env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
 elif target_arch.find('v7a-hard') > 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
        env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
@@ -42,5 +44,3 @@ elif target_arch.find('v7a') > 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
 elif target_arch.find('arm64') >= 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
-else:
-       env.AppendUnique(CPPFLAGS = ['-march=armv5te'])