diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-01-02 23:40:42 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-07 10:54:13 +0000 |
| commit | fb2e4b191376825eb43ce0b086aed3e7acb217f1 (patch) | |
| tree | 12cbb3f11b34211b610dc31f8c5381c46fe33253 | |
| parent | fbb390a17ffcc19356246104d693779c438458f0 (diff) | |
| download | poky-fb2e4b191376825eb43ce0b086aed3e7acb217f1.tar.gz | |
arch-armv4.inc, arch-armv5.inc: Do not tie generating thumb ISA to -march
-march=armv5't'e means that CPU can execute thumb ISA, we do not need to
tie this to exclusively generating thumb ISA, this change means that
when we have thumb in tune features then it can use 't' in -march
options irrespective of ISA being thumb or arm.
This fixes derivative of armv5 tunes and paves way for gcc9 where e.g.
armv5e is dropped and minimum arch supported is armv5te
(From OE-Core rev: 49bc3eab2897307a92b538a045e3d4dce245b0e0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv4.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv5.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc index 813ed159dc..47a7ad2830 100644 --- a/meta/conf/machine/include/arm/arch-armv4.inc +++ b/meta/conf/machine/include/arm/arch-armv4.inc | |||
| @@ -2,7 +2,7 @@ DEFAULTTUNE ?= "armv4" | |||
| 2 | 2 | ||
| 3 | TUNEVALID[arm] = "Enable ARM instruction set" | 3 | TUNEVALID[arm] = "Enable ARM instruction set" |
| 4 | TUNEVALID[armv4] = "Enable instructions for ARMv4" | 4 | TUNEVALID[armv4] = "Enable instructions for ARMv4" |
| 5 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4${ARMPKGSFX_THUMB}', '', d)}" | 5 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4t', '', d)}" |
| 6 | # enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb | 6 | # enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb |
| 7 | # maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does | 7 | # maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does |
| 8 | # checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value | 8 | # checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value |
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc index 46f631c819..f9068af9de 100644 --- a/meta/conf/machine/include/arm/arch-armv5.inc +++ b/meta/conf/machine/include/arm/arch-armv5.inc | |||
| @@ -2,7 +2,7 @@ DEFAULTTUNE ?= "armv5" | |||
| 2 | 2 | ||
| 3 | TUNEVALID[armv5] = "Enable instructions for ARMv5" | 3 | TUNEVALID[armv5] = "Enable instructions for ARMv5" |
| 4 | TUNECONFLICTS[armv5] = "armv4" | 4 | TUNECONFLICTS[armv5] = "armv4" |
| 5 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', ' -march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}', '', d)}" | 5 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', ' -march=armv5t${ARMPKGSFX_DSP}', '', d)}" |
| 6 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 'armv5:', '' ,d)}" | 6 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 'armv5:', '' ,d)}" |
| 7 | 7 | ||
| 8 | require conf/machine/include/arm/arch-armv4.inc | 8 | require conf/machine/include/arm/arch-armv4.inc |