summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-23 16:52:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-24 09:55:05 +0000
commit26e4fed594daefb6923c50171360f925c4822683 (patch)
treee87e044b21c7be00df3c6310212aa3878821c282
parent69c68f470e8e12456a4d9abf2d1c33b857e4ea37 (diff)
downloadopenembedded-core-contrib-26e4fed594daefb6923c50171360f925c4822683.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>
-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"