From: Jon Mason <jdmason@kudzu.us>
Date: Tue, 12 Aug 2025 22:21:41 +0000 (-0400)
Subject: Revert "feature-arm-crypto: Add +nocrypto to -mcpu when crypto not in features"
X-Git-Tag: uninative-5.0~575
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91615ef0cb1cc1bd20affe03cd98219a9385cb48;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

Revert "feature-arm-crypto: Add +nocrypto to -mcpu when crypto not in features"

This reverts commit db1b355b2b15ba57bd89c2dfb88c2c667551863e.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/machine/include/arm/feature-arm-crypto.inc b/meta/conf/machine/include/arm/feature-arm-crypto.inc
index 8202de78e4..aade6ce08d 100644
--- a/meta/conf/machine/include/arm/feature-arm-crypto.inc
+++ b/meta/conf/machine/include/arm/feature-arm-crypto.inc
@@ -2,5 +2,4 @@
 # armv8-a, armv8.1-a, armv8.3-a, armv8.4-a, armv8.5-a, armv8.6-a, and armv8-r
 
 TUNEVALID[crypto] = "Enable cryptographic instructions for ARMv8"
-# See  https://github.com/llvm/llvm-project/issues/85699
-TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '+crypto', '+nocrypto', d)}"
+TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '+crypto', '', d)}"