aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2018-07-17 17:49:17 +0500
committerAwais Belal <awais_belal@mentor.com>2018-07-18 14:40:33 +0500
commitd247d85720ddf2dcd8f9ffd3deb6657128117804 (patch)
tree9ef182259d3c44e5251e36f808939285f2943302
parent54fef0adbe9f43120f41756d80c4c72cec292492 (diff)
downloadmeta-amd-d247d85720ddf2dcd8f9ffd3deb6657128117804.tar.gz
meta-amd-d247d85720ddf2dcd8f9ffd3deb6657128117804.tar.bz2
meta-amd-d247d85720ddf2dcd8f9ffd3deb6657128117804.zip
tune-x.inc: use the m64 TUNE_FEATURE
All the currently supported BSPs are 64bit so use the appropriate m64 TUNE_FEATURE in order to get the build environment evaluated properly. Otherwise the basic -m64 switch which is required for proper linker output specification and other such things do not end up in the correct form and the build fails in case a toolchain that supports 32 and 64bit builds is used. Signed-off-by: Awais Belal <awais_belal@mentor.com>
-rw-r--r--meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc4
-rw-r--r--meta-snowyowl/conf/machine/include/tune-snowyowl.inc3
-rw-r--r--meta-steppeeagle/conf/machine/include/tune-steppeeagle.inc4
-rw-r--r--meta-v1000/conf/machine/include/tune-v1000.inc3
4 files changed, 4 insertions, 10 deletions
diff --git a/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc b/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc
index b78f0f7c..dc3911f5 100644
--- a/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc
+++ b/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc
@@ -3,16 +3,14 @@ DEFAULTTUNE ?= "dbfp4"
require conf/machine/include/x86/arch-x86.inc
require conf/machine/include/x86-base.inc
-
# AMD DB-FP4 64bit (MerlinFalcon)
TUNEVALID[dbfp4] = "Enable AMD DB-FP4 (64 bit) specific processor optimizations"
TUNECONFLICTS[dbfp4] = "m32 mx32"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp4", "${X86ARCH64}", "" ,d)}"
TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp4", " -march=bdver4", "", d)}"
# Extra tune selections
AVAILTUNES += "dbfp4"
-TUNE_FEATURES_tune-dbfp4 = "dbfp4"
+TUNE_FEATURES_tune-dbfp4 = "m64 dbfp4"
BASE_LIB_tune-dbfp4 = "lib64"
TUNE_PKGARCH_tune-dbfp4 = "dbfp4"
PACKAGE_EXTRA_ARCHS_tune-dbfp4 = "${TUNE_PKGARCH_tune-dbfp4}"
diff --git a/meta-snowyowl/conf/machine/include/tune-snowyowl.inc b/meta-snowyowl/conf/machine/include/tune-snowyowl.inc
index 3922b400..15dc4e54 100644
--- a/meta-snowyowl/conf/machine/include/tune-snowyowl.inc
+++ b/meta-snowyowl/conf/machine/include/tune-snowyowl.inc
@@ -5,12 +5,11 @@ require conf/machine/include/x86-base.inc
# AMD DB-FP5 64bit (Snowy Owl)
TUNEVALID[dbfp5] = "Enable AMD DB-FP5 (64 bit) specific processor optimizations"
TUNECONFLICTS[dbfp5] = "m32 mx32"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp5", "${X86ARCH64}", "" ,d)}"
TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp5", " -march=znver1", "", d)}"
# Extra tune selections
AVAILTUNES += "dbfp5"
-TUNE_FEATURES_tune-dbfp5 = "dbfp5"
+TUNE_FEATURES_tune-dbfp5 = "m64 dbfp5"
BASE_LIB_tune-dbfp5 = "lib64"
TUNE_PKGARCH_tune-dbfp5 = "dbfp5"
PACKAGE_EXTRA_ARCHS_tune-dbfp5 = "${TUNE_PKGARCH_tune-dbfp5}"
diff --git a/meta-steppeeagle/conf/machine/include/tune-steppeeagle.inc b/meta-steppeeagle/conf/machine/include/tune-steppeeagle.inc
index 0c142a70..21fecbb1 100644
--- a/meta-steppeeagle/conf/machine/include/tune-steppeeagle.inc
+++ b/meta-steppeeagle/conf/machine/include/tune-steppeeagle.inc
@@ -3,16 +3,14 @@ DEFAULTTUNE ?= "dbft3b"
require conf/machine/include/x86/arch-x86.inc
require conf/machine/include/x86-base.inc
-
# AMD DB-FT3b 64bit (SteppeEagle)
TUNEVALID[dbft3b] = "Enable AMD DB-FT3b (64 bit) specific processor optimizations"
TUNECONFLICTS[dbft3b] = "m32 mx32"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "dbft3b", "${X86ARCH64}", "" ,d)}"
TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "dbft3b", " -march=btver2", "", d)}"
# Extra tune selections
AVAILTUNES += "dbft3b"
-TUNE_FEATURES_tune-dbft3b = "dbft3b"
+TUNE_FEATURES_tune-dbft3b = "m64 dbft3b"
BASE_LIB_tune-dbft3b = "lib64"
TUNE_PKGARCH_tune-dbft3b = "dbft3b"
PACKAGE_EXTRA_ARCHS_tune-dbft3b = "${TUNE_PKGARCH_tune-dbft3b}"
diff --git a/meta-v1000/conf/machine/include/tune-v1000.inc b/meta-v1000/conf/machine/include/tune-v1000.inc
index 90c92e45..1c481cd3 100644
--- a/meta-v1000/conf/machine/include/tune-v1000.inc
+++ b/meta-v1000/conf/machine/include/tune-v1000.inc
@@ -5,12 +5,11 @@ require conf/machine/include/x86-base.inc
# AMD DB-FP5 64bit (v1000)
TUNEVALID[dbfp5] = "Enable AMD DB-FP5 (64 bit) specific processor optimizations"
TUNECONFLICTS[dbfp5] = "m32 mx32"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp5", "${X86ARCH64}", "" ,d)}"
TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp5", " -march=znver1", "", d)}"
# Extra tune selections
AVAILTUNES += "dbfp5"
-TUNE_FEATURES_tune-dbfp5 = "dbfp5"
+TUNE_FEATURES_tune-dbfp5 = "m64 dbfp5"
BASE_LIB_tune-dbfp5 = "lib64"
TUNE_PKGARCH_tune-dbfp5 = "dbfp5"
PACKAGE_EXTRA_ARCHS_tune-dbfp5 = "${TUNE_PKGARCH_tune-dbfp5}"