diff options
| author | Jon Mason <jdmason@kudzu.us> | 2021-08-21 15:32:16 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-22 22:21:47 +0100 |
| commit | da768360dd68ecd164c15397ab222892f0123307 (patch) | |
| tree | 4f1edbc9616749373b09e8303eb530b500aa4565 | |
| parent | fffaf55d036d43037939e3cc987e18894f918102 (diff) | |
| download | poky-da768360dd68ecd164c15397ab222892f0123307.tar.gz | |
arch-arm*: Fix bugs with dsp and simd feature include files
Fix bugs found with a duplicate inclusion of feature-arm-simd.inc and
dsp not being defined in feature-arm-dsp.inc
Found by compiling with DEFAULTTUNE set to 'armv8r' and 'cortexm33'
respectively.
(From OE-Core rev: eb49c1847bb063fa5707843e0c2632023b341fcf)
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv5-dsp.inc | 1 | ||||
| -rw-r--r-- | meta/conf/machine/include/arm/arch-armv8r.inc | 1 | ||||
| -rw-r--r-- | meta/conf/machine/include/arm/feature-arm-dsp.inc | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv5-dsp.inc b/meta/conf/machine/include/arm/arch-armv5-dsp.inc index d296e827cf..f3c749d722 100644 --- a/meta/conf/machine/include/arm/arch-armv5-dsp.inc +++ b/meta/conf/machine/include/arm/arch-armv5-dsp.inc | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # Can't use feature-arm-dsp.inc, since that will add "+dsp", which isn't supported in GCC for ARMv5 | ||
| 1 | ARMPKGSFX_DSP = "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], 'e', '', d)}" | 2 | ARMPKGSFX_DSP = "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], 'e', '', d)}" |
| 2 | TUNEVALID[dsp] = "ARM DSP functionality" | 3 | TUNEVALID[dsp] = "ARM DSP functionality" |
| 3 | 4 | ||
diff --git a/meta/conf/machine/include/arm/arch-armv8r.inc b/meta/conf/machine/include/arm/arch-armv8r.inc index be4ef3e629..0dcfd34c1a 100644 --- a/meta/conf/machine/include/arm/arch-armv8r.inc +++ b/meta/conf/machine/include/arm/arch-armv8r.inc | |||
| @@ -8,7 +8,6 @@ TUNE_CCARGS_MARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'armv8r', ' -march=a | |||
| 8 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8r', 'armv8r:', '', d)}" | 8 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8r', 'armv8r:', '', d)}" |
| 9 | 9 | ||
| 10 | require conf/machine/include/arm/arch-arm64.inc | 10 | require conf/machine/include/arm/arch-arm64.inc |
| 11 | require conf/machine/include/arm/feature-arm-simd.inc | ||
| 12 | require conf/machine/include/arm/feature-arm-crc.inc | 11 | require conf/machine/include/arm/feature-arm-crc.inc |
| 13 | require conf/machine/include/arm/feature-arm-crypto.inc | 12 | require conf/machine/include/arm/feature-arm-crypto.inc |
| 14 | 13 | ||
diff --git a/meta/conf/machine/include/arm/feature-arm-dsp.inc b/meta/conf/machine/include/arm/feature-arm-dsp.inc index ec5007a8ca..7f7ada7461 100644 --- a/meta/conf/machine/include/arm/feature-arm-dsp.inc +++ b/meta/conf/machine/include/arm/feature-arm-dsp.inc | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | # Note: TUNEVALID set in conf/machine/include/arm/arch-armv5-dsp.inc | 1 | ARMPKGSFX_DSP = "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], 'e', '', d)}" |
| 2 | TUNEVALID[dsp] = "ARM DSP functionality" | ||
| 2 | TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], '+dsp', '', d)}" | 3 | TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], '+dsp', '', d)}" |