From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 23 Nov 2021 16:52:33 +0000 (+0000)
Subject: glibc: Fix i586/c3 support
X-Git-Tag: 2021-04.5-hardknott~118
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=59497e4fcef97987beb0057fe6a7dd1332ed20aa;p=openembedded-core.git

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>
---

diff --git a/meta/recipes-core/glibc/glibc_2.33.bb b/meta/recipes-core/glibc/glibc_2.33.bb
index ad5e2b8eb1..a1e9eb3a16 100644
--- a/meta/recipes-core/glibc/glibc_2.33.bb
+++ b/meta/recipes-core/glibc/glibc_2.33.bb
@@ -88,7 +88,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"