summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-10-28 07:33:27 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2020-10-30 14:32:12 +0100
commitc8a0a19b8585661c39e1ba7e16d061d0ae2afc74 (patch)
tree057b3dbe4fc99490ede6218faa6083e34b04336d
parentc87f58e4235fc5c2fe31037917fd999bf4142dca (diff)
downloadopenembedded-core-contrib-jansa/tune-test-dunfell.tar.gz
openembedded-core-contrib-jansa/tune-test-dunfell.tar.bz2
openembedded-core-contrib-jansa/tune-test-dunfell.zip
tune/test.sh: results with thumb enabled (oe-core/dunfell: 197b405dd0 siteinfo: Recognize bigendian sh3be and sh4be)jansa/tune-test-dunfell
* the difference against the tesults from master is expected, because dunfell doesn't have many new tune files and also changes for armv8a TUNE_PKGARCHs from https://git.openembedded.org/openembedded-core/commit/meta/conf/machine?id=08433cc58abf0cf3e42b22d20870a50287cfb8bc https://git.openembedded.org/openembedded-core/commit/meta/conf/machine?id=e114c670d1e670397c1c04292688b7550f54027c https://git.openembedded.org/openembedded-core/commit/meta/conf/machine?id=030cd9021ef50d71482f6acf0e05fe425038c822 $ git diff 32d11ea4242c592c55303af60cae5c4c0aadcf25 --stat=300 | grep -v ' -------' scripts/tune/env.fake-cortexa32.armv8a | 2 +- scripts/tune/env.fake-cortexa32.armv8a-crc | 2 +- scripts/tune/env.fake-cortexa32.armv8a-crc-crypto | 2 +- scripts/tune/env.fake-cortexa32.armv8a-crypto | 2 +- scripts/tune/env.fake-cortexa35 | 8 ++++---- scripts/tune/env.fake-cortexa35.armv8a | 2 +- scripts/tune/env.fake-cortexa35.armv8a-crc | 2 +- scripts/tune/env.fake-cortexa35.armv8a-crc-crypto | 2 +- scripts/tune/env.fake-cortexa35.armv8a-crypto | 2 +- scripts/tune/env.fake-cortexa35.cortexa35 | 8 ++++---- scripts/tune/env.fake-cortexa35.cortexa35-crypto | 8 ++++---- scripts/tune/env.fake-cortexa53 | 8 ++++---- scripts/tune/env.fake-cortexa53.armv8a | 2 +- scripts/tune/env.fake-cortexa53.armv8a-crc | 2 +- scripts/tune/env.fake-cortexa53.armv8a-crc-crypto | 2 +- scripts/tune/env.fake-cortexa53.armv8a-crypto | 2 +- scripts/tune/env.fake-cortexa53.cortexa53 | 8 ++++---- scripts/tune/env.fake-cortexa53.cortexa53-crypto | 8 ++++---- scripts/tune/env.fake-cortexa57-cortexa53 | 10 +++++----- scripts/tune/env.fake-cortexa57-cortexa53.aarch64 | 4 ++-- scripts/tune/env.fake-cortexa57-cortexa53.aarch64_be | 4 ++-- scripts/tune/env.fake-cortexa57-cortexa53.armv8a | 6 +++--- scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc | 6 +++--- scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crc-crypto | 6 +++--- scripts/tune/env.fake-cortexa57-cortexa53.armv8a-crypto | 6 +++--- scripts/tune/env.fake-cortexa57-cortexa53.cortexa57-cortexa53 | 10 +++++----- scripts/tune/env.fake-cortexa72 | 8 ++++---- scripts/tune/env.fake-cortexa72-cortexa53 | 6 +++--- scripts/tune/env.fake-cortexa72-cortexa53.armv8a | 2 +- scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc | 2 +- scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crc-crypto | 2 +- scripts/tune/env.fake-cortexa72-cortexa53.armv8a-crypto | 2 +- scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53 | 6 +++--- scripts/tune/env.fake-cortexa72-cortexa53.cortexa72-cortexa53-crypto | 8 ++++---- scripts/tune/env.fake-cortexa72.armv8a | 2 +- scripts/tune/env.fake-cortexa72.armv8a-crc | 2 +- scripts/tune/env.fake-cortexa72.armv8a-crc-crypto | 2 +- scripts/tune/env.fake-cortexa72.armv8a-crypto | 2 +- scripts/tune/env.fake-cortexa72.cortexa72 | 8 ++++---- scripts/tune/env.fake-thunderx | 2 +- scripts/tune/env.fake-thunderx.armv8a | 2 +- scripts/tune/env.fake-thunderx.armv8a-crc | 2 +- scripts/tune/env.fake-thunderx.armv8a-crc-crypto | 2 +- scripts/tune/env.fake-thunderx.armv8a-crypto | 2 +- scripts/tune/env.fake-thunderx.thunderx | 2 +- scripts/tune/env.fake-thunderx.thunderx_be | 2 +- scripts/tune/log.fake-supersparc | 10 ++++++++++ 2417 files changed, 105 insertions(+), 16703 deletions(-) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv4t6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5t6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5te6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5teb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6t6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6t-novfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6tb6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6thf6
-rw-r--r--scripts/tune/env.fake-arm1136jf-s.armv6thfb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.arm1176jzs6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv4t6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5t6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5te6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5teb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6t6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6t-novfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6tb6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6thf6
-rw-r--r--scripts/tune/env.fake-arm1176jz-s.armv6thfb6
-rw-r--r--scripts/tune/env.fake-arm920t6
-rw-r--r--scripts/tune/env.fake-arm920t.arm920t6
-rw-r--r--scripts/tune/env.fake-arm920t.armv4t6
-rw-r--r--scripts/tune/env.fake-arm920t.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm926ejs6
-rw-r--r--scripts/tune/env.fake-arm926ejs.arm926ejs6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv4t6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv4tb6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5t6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tb6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5te6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5teb6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-arm926ejs.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-arm9tdmi6
-rw-r--r--scripts/tune/env.fake-arm9tdmi.arm9tdmi5
-rw-r--r--scripts/tune/env.fake-arm9tdmi.armv4t6
-rw-r--r--scripts/tune/env.fake-arm9tdmi.armv4tb6
-rw-r--r--scripts/tune/env.fake-ep9312.armv4t6
-rw-r--r--scripts/tune/env.fake-ep9312.armv4tb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv4t6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv4tb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5t6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5te6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5teb6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-iwmmxt.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-strongarm1100.armv4t6
-rw-r--r--scripts/tune/env.fake-strongarm1100.armv4tb6
-rw-r--r--scripts/tune/env.fake-xscale6
-rw-r--r--scripts/tune/env.fake-xscale.armv4t6
-rw-r--r--scripts/tune/env.fake-xscale.armv4tb6
-rw-r--r--scripts/tune/env.fake-xscale.armv5t6
-rw-r--r--scripts/tune/env.fake-xscale.armv5t-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tb6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5te6
-rw-r--r--scripts/tune/env.fake-xscale.armv5te-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5teb6
-rw-r--r--scripts/tune/env.fake-xscale.armv5teb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tehf-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5tehfb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5thf-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.armv5thfb-vfp6
-rw-r--r--scripts/tune/env.fake-xscale.xscale6
-rw-r--r--scripts/tune/env.fake-xscale.xscale-be6
-rw-r--r--scripts/tune/log.fake-arm9tdmi.arm9tdmi8
103 files changed, 308 insertions, 311 deletions
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv4t b/scripts/tune/env.fake-arm1136jf-s.armv4t
index 5192e270c8..38fc2ec264 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv4t
+++ b/scripts/tune/env.fake-arm1136jf-s.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv4tb b/scripts/tune/env.fake-arm1136jf-s.armv4tb
index d5af1feb80..4f55fca2eb 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv4tb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5t b/scripts/tune/env.fake-arm1136jf-s.armv5t
index de8ab34eb1..85886cf929 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5t
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp
index 000c49d240..120636b9e7 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tb b/scripts/tune/env.fake-arm1136jf-s.armv5tb
index 01b0bd215d..397e450028 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp
index 8aa197228f..94e75891a6 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5te b/scripts/tune/env.fake-arm1136jf-s.armv5te
index 1e26252d81..2e067bf94d 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5te
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp
index dfa17bc727..90a36e06d5 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5teb b/scripts/tune/env.fake-arm1136jf-s.armv5teb
index c0a841313e..5b222a7547 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5teb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp
index e4801c5e0c..61daa16a3e 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp
index a335095896..ae4f023073 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp
index 3260df690a..d9714862be 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp
index 6768edd45c..76ff7343c8 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp b/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp
index 0aff3ffffc..f579b6fa2d 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6t b/scripts/tune/env.fake-arm1136jf-s.armv6t
index 78697687ae..088aeb12e0 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6t
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp b/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp
index b5b7fba142..b702a26609 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6t-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -marm"
+TUNE_CCARGS=" -march=armv6 -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6tb b/scripts/tune/env.fake-arm1136jf-s.armv6tb
index b592471f7b..196abd67ea 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6tb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp b/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp
index e2a82c8216..b27c1414b5 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6tb-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -marm"
+TUNE_CCARGS=" -march=armv6 -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6thf b/scripts/tune/env.fake-arm1136jf-s.armv6thf
index b2536cf499..8ede1f1d2d 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6thf
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6thf
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1136jf-s.armv6thfb b/scripts/tune/env.fake-arm1136jf-s.armv6thfb
index ca263097c7..effc37f4ae 100644
--- a/scripts/tune/env.fake-arm1136jf-s.armv6thfb
+++ b/scripts/tune/env.fake-arm1136jf-s.armv6thfb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_arm1136jf_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s b/scripts/tune/env.fake-arm1176jz-s
index c9110c6bea..25a922209f 100644
--- a/scripts/tune/env.fake-arm1176jz-s
+++ b/scripts/tune/env.fake-arm1176jz-s
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6-novfp armv6t-novfp armv6 armv6t armv6hf armv6thf armv6b-novfp armv6tb-novfp armv6b armv6tb armv6hfb armv6thfb arm1176jzs arm1176jzs-be"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t arm1176jzs arm1176jzst fake_arm1176jz_s"
-TUNE_CCARGS=" -marm -mcpu=arm1176jz-s"
+TUNE_CCARGS=" -mthumb -mcpu=arm1176jz-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb arm1176jzs"
-TUNE_PKGARCH="arm1176jzs"
-export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm1176jz-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm1176jzst"
+export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm1176jz-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs
index cfc87abdc8..d566a8f05b 100644
--- a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs
+++ b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t arm1176jzs arm1176jzst fake_arm1176jz_s"
-TUNE_CCARGS=" -marm -mcpu=arm1176jz-s"
+TUNE_CCARGS=" -mthumb -mcpu=arm1176jz-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb arm1176jzs"
-TUNE_PKGARCH="arm1176jzs"
-export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm1176jz-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm1176jzst"
+export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm1176jz-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be
index 4e0597bd5d..b3f0ef0df0 100644
--- a/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be
+++ b/scripts/tune/env.fake-arm1176jz-s.arm1176jzs-be
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb arm1176jzsb arm1176jzstb fake_arm1176jz_s"
-TUNE_CCARGS=" -marm -mcpu=arm1176jz-s"
+TUNE_CCARGS=" -mthumb -mcpu=arm1176jz-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb arm1176jzs bigendian"
-TUNE_PKGARCH="arm1176jzsb"
-export CC="armeb-oe-linux-gnueabi-gcc -marm -mcpu=arm1176jz-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm1176jzstb"
+export CC="armeb-oe-linux-gnueabi-gcc -mthumb -mcpu=arm1176jz-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv4t b/scripts/tune/env.fake-arm1176jz-s.armv4t
index b8a97b81a2..f6ac8e9296 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv4t
+++ b/scripts/tune/env.fake-arm1176jz-s.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv4tb b/scripts/tune/env.fake-arm1176jz-s.armv4tb
index c95cbf3eeb..dee74cb30a 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv4tb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5t b/scripts/tune/env.fake-arm1176jz-s.armv5t
index 186482916e..f279424d11 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5t
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp
index 177dd12e6b..523c305224 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tb b/scripts/tune/env.fake-arm1176jz-s.armv5tb
index 7f2dda8dbc..239af7f0b7 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp
index adfe4793f2..5e16545865 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5te b/scripts/tune/env.fake-arm1176jz-s.armv5te
index bcbdd01411..84ae5787ae 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5te
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp
index 1e855828a8..b4cf40efa4 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5teb b/scripts/tune/env.fake-arm1176jz-s.armv5teb
index 2012821f83..7e93c20b64 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5teb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp
index 0c7907f42d..591a2f2b05 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp
index 7e8a434bea..327206eacd 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp
index f54b3ccd82..b1cb73cafc 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp
index 80062e172f..f66184d630 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp b/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp
index 4a1dcbc36c..5a353ecdae 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6t b/scripts/tune/env.fake-arm1176jz-s.armv6t
index 87ca718926..d1663b9b65 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6t
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6 armv6t armv6-vfp armv6t-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp"
-TUNE_PKGARCH="armv6-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp b/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp
index d36333126d..e75b3f45ce 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6t-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te armv6 armv6t fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -marm"
+TUNE_CCARGS=" -march=armv6 -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb"
-TUNE_PKGARCH="armv6"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6tb b/scripts/tune/env.fake-arm1176jz-s.armv6tb
index 8bcf4c1969..333a284014 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6tb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv6b armv6tb armv6b-vfp armv6tb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp bigendian"
-TUNE_PKGARCH="armv6b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp b/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp
index 1dc11ddf88..b058f5757f 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6tb-novfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb armv6b armv6tb fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -marm"
+TUNE_CCARGS=" -march=armv6 -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv6 thumb bigendian"
-TUNE_PKGARCH="armv6b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6thf b/scripts/tune/env.fake-arm1176jz-s.armv6thf
index cc11a47f2f..08a91d7f51 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6thf
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6thf
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv6hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm1176jz-s.armv6thfb b/scripts/tune/env.fake-arm1176jz-s.armv6thfb
index 607be4d96d..9685a08b6e 100644
--- a/scripts/tune/env.fake-arm1176jz-s.armv6thfb
+++ b/scripts/tune/env.fake-arm1176jz-s.armv6thfb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp armv6hfb-vfp armv6thfb-vfp fake_arm1176jz_s"
-TUNE_CCARGS=" -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv6 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv6hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv6thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv6 -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t b/scripts/tune/env.fake-arm920t
index 684aaff57d..69ee23f8e6 100644
--- a/scripts/tune/env.fake-arm920t
+++ b/scripts/tune/env.fake-arm920t
@@ -1,6 +1,6 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb arm920t"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm920t"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t.arm920t b/scripts/tune/env.fake-arm920t.arm920t
index c7dd31a255..1233bdc87b 100644
--- a/scripts/tune/env.fake-arm920t.arm920t
+++ b/scripts/tune/env.fake-arm920t.arm920t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t arm920t arm920tt fake_arm920t"
-TUNE_CCARGS=" -marm -mcpu=arm920t"
+TUNE_CCARGS=" -mthumb -mcpu=arm920t"
TUNE_FEATURES="arm thumb arm920t"
-TUNE_PKGARCH="arm920t"
-export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm920t --sysroot=SYSROOT"
+TUNE_PKGARCH="arm920tt"
+export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm920t --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t.armv4t b/scripts/tune/env.fake-arm920t.armv4t
index de5456ae01..6fe42d0572 100644
--- a/scripts/tune/env.fake-arm920t.armv4t
+++ b/scripts/tune/env.fake-arm920t.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm920t"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm920t.armv4tb b/scripts/tune/env.fake-arm920t.armv4tb
index 8c96e7e4b5..a766d1f80a 100644
--- a/scripts/tune/env.fake-arm920t.armv4tb
+++ b/scripts/tune/env.fake-arm920t.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm920t"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs b/scripts/tune/env.fake-arm926ejs
index 3fcca37e9c..6a3a634374 100644
--- a/scripts/tune/env.fake-arm926ejs
+++ b/scripts/tune/env.fake-arm926ejs
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp arm926ejs"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.arm926ejs b/scripts/tune/env.fake-arm926ejs.arm926ejs
index ec3d0b6be0..16389c0e80 100644
--- a/scripts/tune/env.fake-arm926ejs.arm926ejs
+++ b/scripts/tune/env.fake-arm926ejs.arm926ejs
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te arm926ejste arm926ejse fake_arm926ejs"
-TUNE_CCARGS=" -marm -mcpu=arm926ej-s"
+TUNE_CCARGS=" -mthumb -mcpu=arm926ej-s"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb dsp arm926ejs"
-TUNE_PKGARCH="arm926ejse"
-export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=arm926ej-s --sysroot=SYSROOT"
+TUNE_PKGARCH="arm926ejste"
+export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm926ej-s --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv4t b/scripts/tune/env.fake-arm926ejs.armv4t
index ba97695bac..2df887cf93 100644
--- a/scripts/tune/env.fake-arm926ejs.armv4t
+++ b/scripts/tune/env.fake-arm926ejs.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_arm926ejs"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv4tb b/scripts/tune/env.fake-arm926ejs.armv4tb
index 187605e000..6f0a60563d 100644
--- a/scripts/tune/env.fake-arm926ejs.armv4tb
+++ b/scripts/tune/env.fake-arm926ejs.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_arm926ejs"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5t b/scripts/tune/env.fake-arm926ejs.armv5t
index eedf89ce75..78547ec134 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5t
+++ b/scripts/tune/env.fake-arm926ejs.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5t-vfp b/scripts/tune/env.fake-arm926ejs.armv5t-vfp
index c72b48dde8..1a8b8d989b 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5t-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tb b/scripts/tune/env.fake-arm926ejs.armv5tb
index baf3111070..652c5b4e98 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tb
+++ b/scripts/tune/env.fake-arm926ejs.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tb-vfp b/scripts/tune/env.fake-arm926ejs.armv5tb-vfp
index fc875df80d..bafbd4797d 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5te b/scripts/tune/env.fake-arm926ejs.armv5te
index a9806ae920..eee087f6cf 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5te
+++ b/scripts/tune/env.fake-arm926ejs.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5te-vfp b/scripts/tune/env.fake-arm926ejs.armv5te-vfp
index 4f684c2719..6c8867f6e0 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5te-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5teb b/scripts/tune/env.fake-arm926ejs.armv5teb
index 3c9b4aac78..3babe52d7a 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5teb
+++ b/scripts/tune/env.fake-arm926ejs.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5teb-vfp b/scripts/tune/env.fake-arm926ejs.armv5teb-vfp
index 713f20b369..3c9751cce0 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5teb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp b/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp
index 333219d8cd..74b6ed0de2 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp b/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp
index e9e556b7ea..8d93c18baf 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5thf-vfp b/scripts/tune/env.fake-arm926ejs.armv5thf-vfp
index ecf0f89738..14754b60bb 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5thf-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp b/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp
index dea5421aab..bbfc39568b 100644
--- a/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp
+++ b/scripts/tune/env.fake-arm926ejs.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_arm926ejs"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi b/scripts/tune/env.fake-arm9tdmi
index bcdb983e29..a2c534d8c1 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 -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.arm9tdmi b/scripts/tune/env.fake-arm9tdmi.arm9tdmi
new file mode 100644
index 0000000000..7700296a45
--- /dev/null
+++ b/scripts/tune/env.fake-arm9tdmi.arm9tdmi
@@ -0,0 +1,5 @@
+PACKAGE_ARCHS="all any noarch arm armv4 armv4t arm9tdmit fake_arm9tdmi"
+TUNE_CCARGS=" -mthumb -mcpu=arm9tdmi"
+TUNE_FEATURES="arm thumb arm9tdmi"
+TUNE_PKGARCH="arm9tdmit"
+export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=arm9tdmi --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.armv4t b/scripts/tune/env.fake-arm9tdmi.armv4t
index 8ce9d17921..96040e9ee4 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 -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-arm9tdmi.armv4tb b/scripts/tune/env.fake-arm9tdmi.armv4tb
index 900e3a76f7..2eb20c232b 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 -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-ep9312.armv4t b/scripts/tune/env.fake-ep9312.armv4t
index de7873947e..f1d7088b86 100644
--- a/scripts/tune/env.fake-ep9312.armv4t
+++ b/scripts/tune/env.fake-ep9312.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_ep9312"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-ep9312.armv4tb b/scripts/tune/env.fake-ep9312.armv4tb
index f7f1dd29a0..1877718fa2 100644
--- a/scripts/tune/env.fake-ep9312.armv4tb
+++ b/scripts/tune/env.fake-ep9312.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_ep9312"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv4t b/scripts/tune/env.fake-iwmmxt.armv4t
index 0bbf413db9..c49ec734f9 100644
--- a/scripts/tune/env.fake-iwmmxt.armv4t
+++ b/scripts/tune/env.fake-iwmmxt.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_iwmmxt"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv4tb b/scripts/tune/env.fake-iwmmxt.armv4tb
index f068fa5233..73f4552422 100644
--- a/scripts/tune/env.fake-iwmmxt.armv4tb
+++ b/scripts/tune/env.fake-iwmmxt.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_iwmmxt"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5t b/scripts/tune/env.fake-iwmmxt.armv5t
index be60b03cb1..72566da524 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5t
+++ b/scripts/tune/env.fake-iwmmxt.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5t-vfp b/scripts/tune/env.fake-iwmmxt.armv5t-vfp
index af32a6fd8c..3e253b15a1 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5t-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tb b/scripts/tune/env.fake-iwmmxt.armv5tb
index cdfe022590..3a4aa90cab 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tb
+++ b/scripts/tune/env.fake-iwmmxt.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tb-vfp b/scripts/tune/env.fake-iwmmxt.armv5tb-vfp
index f86c6a8b79..21a8c11290 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5te b/scripts/tune/env.fake-iwmmxt.armv5te
index 552bdd637c..f2e0cef570 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5te
+++ b/scripts/tune/env.fake-iwmmxt.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5te-vfp b/scripts/tune/env.fake-iwmmxt.armv5te-vfp
index 77bb2cda9b..e5480f39a6 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5te-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5teb b/scripts/tune/env.fake-iwmmxt.armv5teb
index 9b963ce3cb..250f2a35bb 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5teb
+++ b/scripts/tune/env.fake-iwmmxt.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5teb-vfp b/scripts/tune/env.fake-iwmmxt.armv5teb-vfp
index 93411f3fea..4e6b4f8da9 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5teb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp b/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp
index ebcaabf228..5756a0f23f 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp b/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp
index 19f8e4af53..aaedb3df11 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5thf-vfp b/scripts/tune/env.fake-iwmmxt.armv5thf-vfp
index ab08c6a45d..f9c677ec36 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5thf-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp b/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp
index 1d12669ed1..28082858c6 100644
--- a/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp
+++ b/scripts/tune/env.fake-iwmmxt.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_iwmmxt"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-strongarm1100.armv4t b/scripts/tune/env.fake-strongarm1100.armv4t
index 4d2bf30b1d..15009d296f 100644
--- a/scripts/tune/env.fake-strongarm1100.armv4t
+++ b/scripts/tune/env.fake-strongarm1100.armv4t
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_strongarm1100"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-strongarm1100.armv4tb b/scripts/tune/env.fake-strongarm1100.armv4tb
index 1bfe224ffc..f3d4b8b762 100644
--- a/scripts/tune/env.fake-strongarm1100.armv4tb
+++ b/scripts/tune/env.fake-strongarm1100.armv4tb
@@ -1,5 +1,5 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_strongarm1100"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale b/scripts/tune/env.fake-xscale
index 307192e7d5..1f3f71393e 100644
--- a/scripts/tune/env.fake-xscale
+++ b/scripts/tune/env.fake-xscale
@@ -1,8 +1,8 @@
AVAILTUNES=" armv4 armv4t armv4b armv4tb armv5 armv5t armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp armv5b armv5tb armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv5ehf-vfp armv5tehf-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp armv5ehfb-vfp armv5tehfb-vfp xscale xscale-be"
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv4t b/scripts/tune/env.fake-xscale.armv4t
index 53fca2f9a9..ab53ae3a35 100644
--- a/scripts/tune/env.fake-xscale.armv4t
+++ b/scripts/tune/env.fake-xscale.armv4t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t fake_xscale"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb"
-TUNE_PKGARCH="armv4"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv4tb b/scripts/tune/env.fake-xscale.armv4tb
index 8b51a92612..691a4544c1 100644
--- a/scripts/tune/env.fake-xscale.armv4tb
+++ b/scripts/tune/env.fake-xscale.armv4tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb fake_xscale"
-TUNE_CCARGS=" -march=armv4t -marm"
+TUNE_CCARGS=" -march=armv4t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv4 thumb bigendian"
-TUNE_PKGARCH="armv4b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv4tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv4t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5t b/scripts/tune/env.fake-xscale.armv5t
index aa06fc74bb..d1fb548134 100644
--- a/scripts/tune/env.fake-xscale.armv5t
+++ b/scripts/tune/env.fake-xscale.armv5t
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t fake_xscale"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb"
-TUNE_PKGARCH="armv5"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5t-vfp b/scripts/tune/env.fake-xscale.armv5t-vfp
index f26ddc912e..1fef2df36e 100644
--- a/scripts/tune/env.fake-xscale.armv5t-vfp
+++ b/scripts/tune/env.fake-xscale.armv5t-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp"
-TUNE_PKGARCH="armv5-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5t-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tb b/scripts/tune/env.fake-xscale.armv5tb
index 00d7babe7b..0a2bf4d7f2 100644
--- a/scripts/tune/env.fake-xscale.armv5tb
+++ b/scripts/tune/env.fake-xscale.armv5tb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb fake_xscale"
-TUNE_CCARGS=" -march=armv5t -marm"
+TUNE_CCARGS=" -march=armv5t -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb bigendian"
-TUNE_PKGARCH="armv5b"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tb-vfp b/scripts/tune/env.fake-xscale.armv5tb-vfp
index 166113cf66..2775ce1033 100644
--- a/scripts/tune/env.fake-xscale.armv5tb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5tb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp bigendian"
-TUNE_PKGARCH="armv5b-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5te b/scripts/tune/env.fake-xscale.armv5te
index 2f81614a21..25a6029381 100644
--- a/scripts/tune/env.fake-xscale.armv5te
+++ b/scripts/tune/env.fake-xscale.armv5te
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp"
-TUNE_PKGARCH="armv5e"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5te-vfp b/scripts/tune/env.fake-xscale.armv5te-vfp
index 6facf306a2..efb215d49d 100644
--- a/scripts/tune/env.fake-xscale.armv5te-vfp
+++ b/scripts/tune/env.fake-xscale.armv5te-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp"
-TUNE_PKGARCH="armv5e-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5te-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5teb b/scripts/tune/env.fake-xscale.armv5teb
index 765ac50dba..6b806de1d9 100644
--- a/scripts/tune/env.fake-xscale.armv5teb
+++ b/scripts/tune/env.fake-xscale.armv5teb
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm"
+TUNE_CCARGS=" -march=armv5te -mthumb"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm armv5 thumb dsp bigendian"
-TUNE_PKGARCH="armv5eb"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5teb-vfp b/scripts/tune/env.fake-xscale.armv5teb-vfp
index 2ca299e4bb..594cc6cf79 100644
--- a/scripts/tune/env.fake-xscale.armv5teb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5teb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5b-vfp armv5tb-vfp armv5eb armv5teb armv5eb-vfp armv5teb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp"
TUNE_CCARGS_MFLOAT="softfp"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp bigendian"
-TUNE_PKGARCH="armv5eb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5teb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=softfp --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tehf-vfp b/scripts/tune/env.fake-xscale.armv5tehf-vfp
index 0e7a094765..7f2eb160bc 100644
--- a/scripts/tune/env.fake-xscale.armv5tehf-vfp
+++ b/scripts/tune/env.fake-xscale.armv5tehf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard"
-TUNE_PKGARCH="armv5ehf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5tehfb-vfp b/scripts/tune/env.fake-xscale.armv5tehfb-vfp
index 21c8066542..84155075b1 100644
--- a/scripts/tune/env.fake-xscale.armv5tehfb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5tehfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp armv5ehfb-vfp armv5tehfb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb dsp vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5ehfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5tehfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5thf-vfp b/scripts/tune/env.fake-xscale.armv5thf-vfp
index 22397067f7..9ff3c58eb9 100644
--- a/scripts/tune/env.fake-xscale.armv5thf-vfp
+++ b/scripts/tune/env.fake-xscale.armv5thf-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hf-vfp armv5thf-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard"
-TUNE_PKGARCH="armv5hf-vfp"
-export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thf-vfp"
+export CC="arm-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.armv5thfb-vfp b/scripts/tune/env.fake-xscale.armv5thfb-vfp
index 4c244d7e05..1a5afe615a 100644
--- a/scripts/tune/env.fake-xscale.armv5thfb-vfp
+++ b/scripts/tune/env.fake-xscale.armv5thfb-vfp
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armv5hfb-vfp armv5thfb-vfp fake_xscale"
-TUNE_CCARGS=" -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard"
+TUNE_CCARGS=" -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard"
TUNE_CCARGS_MFLOAT="hard"
TUNE_CCARGS_MFPU=" vfp"
TUNE_FEATURES="arm armv5 thumb vfp callconvention-hard bigendian"
-TUNE_PKGARCH="armv5hfb-vfp"
-export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -marm -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
+TUNE_PKGARCH="armv5thfb-vfp"
+export CC="armeb-oe-linux-gnueabi-gcc -march=armv5t -mthumb -mfpu=vfp -mfloat-abi=hard --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.xscale b/scripts/tune/env.fake-xscale.xscale
index 8b226120a8..9a0d4998a5 100644
--- a/scripts/tune/env.fake-xscale.xscale
+++ b/scripts/tune/env.fake-xscale.xscale
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5e armv5te xscale xscalet xscalee xscalete fake_xscale"
-TUNE_CCARGS=" -marm -mcpu=xscale"
+TUNE_CCARGS=" -mthumb -mcpu=xscale"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb dsp xscale"
-TUNE_PKGARCH="xscalee"
-export CC="arm-oe-linux-gnueabi-gcc -marm -mcpu=xscale --sysroot=SYSROOT"
+TUNE_PKGARCH="xscalete"
+export CC="arm-oe-linux-gnueabi-gcc -mthumb -mcpu=xscale --sysroot=SYSROOT"
diff --git a/scripts/tune/env.fake-xscale.xscale-be b/scripts/tune/env.fake-xscale.xscale-be
index 6f0021e6e6..46ad685563 100644
--- a/scripts/tune/env.fake-xscale.xscale-be
+++ b/scripts/tune/env.fake-xscale.xscale-be
@@ -1,7 +1,7 @@
PACKAGE_ARCHS="all any noarch armeb armv4b armv4tb armv5b armv5tb armv5eb armv5teb xscaleb xscaletb xscaleeb xscaleteb fake_xscale"
-TUNE_CCARGS=" -marm -mcpu=xscale"
+TUNE_CCARGS=" -mthumb -mcpu=xscale"
TUNE_CCARGS_MFLOAT=""
TUNE_CCARGS_MFPU=""
TUNE_FEATURES="arm thumb dsp xscale bigendian"
-TUNE_PKGARCH="xscaleeb"
-export CC="armeb-oe-linux-gnueabi-gcc -marm -mcpu=xscale --sysroot=SYSROOT"
+TUNE_PKGARCH="xscaleteb"
+export CC="armeb-oe-linux-gnueabi-gcc -mthumb -mcpu=xscale --sysroot=SYSROOT"
diff --git a/scripts/tune/log.fake-arm9tdmi.arm9tdmi b/scripts/tune/log.fake-arm9tdmi.arm9tdmi
deleted file mode 100644
index afe57db49e..0000000000
--- a/scripts/tune/log.fake-arm9tdmi.arm9tdmi
+++ /dev/null
@@ -1,8 +0,0 @@
-NOTE: Reconnecting to bitbake server...
-ERROR: OE-core's config sanity checker detected a potential misconfiguration.
- Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
- Following is the list of potential problems / advisories:
-
- Error, the PACKAGE_ARCHS variable (all any noarch arm armv4 armv4t arm9tdmit fake_arm9tdmi) for DEFAULTTUNE (arm9tdmi) does not contain TUNE_PKGARCH (arm9tdmi).
-
-Summary: There was 1 ERROR message shown, returning a non-zero exit code.