summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-23 16:52:33 +0000
committerAnuj Mittal <anuj.mittal@intel.com>2021-12-07 14:45:40 +0800
commit849626cf284a76a4b496ed9935d6a6365a5a13e3 (patch)
tree00b17e7e494e31fdc0ca703a3ad5007c7cad0896 /meta/recipes-core
parentc3d91b1a2b2ad87c2715a7793f1f408e3b3ba8ef (diff)
downloadopenembedded-core-contrib-849626cf284a76a4b496ed9935d6a6365a5a13e3.tar.gz
glibc: Fix i586/c3 support
CET can't be enabled on i586 or c3 for x86, adjust the configuration accordingly to fix those builds. [YOCTO #14632] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 26e4fed594daefb6923c50171360f925c4822683) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glibc/glibc_2.34.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc_2.34.bb b/meta/recipes-core/glibc/glibc_2.34.bb
index 7206477278..7efc1ec1ef 100644
--- a/meta/recipes-core/glibc/glibc_2.34.bb
+++ b/meta/recipes-core/glibc/glibc_2.34.bb
@@ -90,7 +90,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
-EXTRA_OECONF:append:x86 = " --enable-cet"
+EXTRA_OECONF:append:x86 = " ${@bb.utils.contains_any('TUNE_FEATURES', 'i586 c3', '--disable-cet', '--enable-cet', d)}"
EXTRA_OECONF:append:x86-64 = " --enable-cet"
PACKAGECONFIG ??= "nscd memory-tagging"