[OE-core][PATCH] arch-arm*: Fix bugs with dsp and simd feature include files

[OE-core][PATCH] arch-arm*: Fix bugs with dsp and simd feature include files

[Jon Mason]

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.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 meta/conf/machine/include/arm/arch-armv5-dsp.inc  | 1 +
 meta/conf/machine/include/arm/arch-armv8r.inc     | 1 -
 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 d296e827cf66..f3c749d7223e 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 @@
+# Can't use feature-arm-dsp.inc, since that will add "+dsp", which isn't supported in GCC for ARMv5
 ARMPKGSFX_DSP = "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], 'e', '', d)}"
 TUNEVALID[dsp] = "ARM DSP functionality"
 
diff --git a/meta/conf/machine/include/arm/arch-armv8r.inc b/meta/conf/machine/include/arm/arch-armv8r.inc
index be4ef3e629df..0dcfd34c1a2b 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
 MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8r', 'armv8r:', '', d)}"
 
 require conf/machine/include/arm/arch-arm64.inc
-require conf/machine/include/arm/feature-arm-simd.inc
 require conf/machine/include/arm/feature-arm-crc.inc
 require conf/machine/include/arm/feature-arm-crypto.inc
 
diff --git a/meta/conf/machine/include/arm/feature-arm-dsp.inc b/meta/conf/machine/include/arm/feature-arm-dsp.inc
index ec5007a8ca75..7f7ada7461ca 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 @@
-# Note: TUNEVALID set in conf/machine/include/arm/arch-armv5-dsp.inc
+ARMPKGSFX_DSP = "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], 'e', '', d)}"
+TUNEVALID[dsp] = "ARM DSP functionality"
 TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', [ 'dsp' ], '+dsp', '', d)}"
-- 
2.20.1