From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 30 Oct 2020 14:22:13 +0000 (+0100)
Subject: tune/test.sh: arm9tdmi results without thumb (oe-core: "tune-arm9tdmi.inc: include... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc5c36a1d8524e08377547b36fbb54fba718fc0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

tune/test.sh: arm9tdmi results without thumb (oe-core: "tune-arm9tdmi.inc: include arm9tdmi in PACKAGE_ARCHS")

* this was without
  PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
  ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

  which revealed issue in tune-arm9tdmi.inc I've fixed it in pending commit:
  "tune-arm9tdmi.inc: include arm9tdmi in PACKAGE_ARCHS"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/scripts/tune/env.fake-arm9tdmi b/scripts/tune/env.fake-arm9tdmi
index a2c534d8c18..bcdb983e290 100644
--- a/scripts/tune/env.fake-arm9tdmi
+++ b/scripts/tune/env.fake-arm9tdmi
@@ -1,6 +1,6 @@
 AVAILTUNES=" armv4 armv4t armv4b armv4tb arm9tdmi"
 PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm9tdmi"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
 TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc  -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc  -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.arm9tdmi b/scripts/tune/env.fake-arm9tdmi.arm9tdmi
index 7700296a454..5d0b9adbe0f 100644
--- a/scripts/tune/env.fake-arm9tdmi.arm9tdmi
+++ b/scripts/tune/env.fake-arm9tdmi.arm9tdmi
@@ -1,5 +1,5 @@
-PACKAGE_ARCHS="all any noarch arm armv4 armv4t arm9tdmit fake_arm9tdmi"
-TUNE_CCARGS=" -mthumb -mcpu=arm9tdmi"
+PACKAGE_ARCHS="all any noarch arm armv4 armv4t arm9tdmi arm9tdmit fake_arm9tdmi"
+TUNE_CCARGS=" -marm -mcpu=arm9tdmi"
 TUNE_FEATURES="arm thumb arm9tdmi"
-TUNE_PKGARCH="arm9tdmit"
-export CC="arm-oe-linux-gnueabi-gcc  -mthumb -mcpu=arm9tdmi --sysroot=SYSROOT"
+TUNE_PKGARCH="arm9tdmi"
+export CC="arm-oe-linux-gnueabi-gcc  -marm -mcpu=arm9tdmi --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.armv4t b/scripts/tune/env.fake-arm9tdmi.armv4t
index 96040e9ee43..8ce9d17921a 100644
--- a/scripts/tune/env.fake-arm9tdmi.armv4t
+++ b/scripts/tune/env.fake-arm9tdmi.armv4t
@@ -1,5 +1,5 @@
 PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm9tdmi"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
 TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4t"
-export CC="arm-oe-linux-gnueabi-gcc  -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4"
+export CC="arm-oe-linux-gnueabi-gcc  -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.armv4tb b/scripts/tune/env.fake-arm9tdmi.armv4tb
index 2eb20c232b7..900e3a76f77 100644
--- a/scripts/tune/env.fake-arm9tdmi.armv4tb
+++ b/scripts/tune/env.fake-arm9tdmi.armv4tb
@@ -1,5 +1,5 @@
 PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm9tdmi"
-TUNE_CCARGS=" -march=armv4t -mthumb"
+TUNE_CCARGS=" -march=armv4t -marm"
 TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4tb"
-export CC="armeb-oe-linux-gnueabi-gcc  -march=armv4t -mthumb --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4b"
+export CC="armeb-oe-linux-gnueabi-gcc  -march=armv4t -marm --sysroot=SYSROOT"
diff --git a/scripts/tune/test.sh b/scripts/tune/test.sh
index 8d1a4c16f09..51bb059ca17 100755
--- a/scripts/tune/test.sh
+++ b/scripts/tune/test.sh
@@ -8,7 +8,7 @@ export LC_ALL=C
 
 TUNE_TEST_DIR=`dirname $0`
 
-INCLUDES_TO_TEST=`find openembedded-core/meta/conf/machine/include/ -name tune-\*.inc | sort | sed 's%openembedded-core/meta/%%g'`
+INCLUDES_TO_TEST=`find openembedded-core/meta/conf/machine/include/ -name tune-arm9tdmi.inc | sort | sed 's%openembedded-core/meta/%%g'`
 INCLUDES=`echo "${INCLUDES_TO_TEST}" | wc -l`
 INCLUDE=0