diff mbox series

[honister,11/33] glibc: Fix i586/c3 support

Message ID	849626cf284a76a4b496ed9935d6a6365a5a13e3.1639012800.git.anuj.mittal@intel.com
State	Accepted, archived
Commit	849626cf284a76a4b496ed9935d6a6365a5a13e3
Headers	show Return-Path: <anuj.mittal@intel.com> ip: 192.55.52.93, mailfrom: anuj.mittal@intel.com) From: Anuj Mittal <anuj.mittal@intel.com> To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 11/33] glibc: Fix i586/c3 support Date: Thu, 9 Dec 2021 09:29:10 +0800 Message-Id: <849626cf284a76a4b496ed9935d6a6365a5a13e3.1639012800.git.anuj.mittal@intel.com> In-Reply-To: <cover.1639012800.git.anuj.mittal@intel.com> References: <cover.1639012800.git.anuj.mittal@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[honister,01/33] wic: use shutil.which \| expand [honister,01/33] wic: use shutil.which [honister,02/33] rust-cross: Fix directory not deleted for race glibc vs. musl [honister,03/33] maintainers.inc: fix up rust-cross entry [honister,04/33] rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH [honister,05/33] classes/meson: Add optional rust definitions [honister,06/33] rootfs-postcommands: update systemd_create_users [honister,07/33] classes/crate-fetch: Ensure crate fetcher is available [honister,08/33] buildhistory: Fix srcrevs output [honister,09/33] gmp: fix CVE-2021-43618 [honister,10/33] wic: support rootdev identified by partition label [honister,11/33] glibc: Fix i586/c3 support [honister,12/33] linux-yocto/5.14: update to v5.14.18 [honister,13/33] linux-yocto/5.10: update to v5.10.79 [honister,14/33] systemd: update 249.3 -> 249.4 [honister,15/33] systemd: update 249.4 -> 249.5 [honister,16/33] systemd: upgrade 249.5 -> 249.6 [honister,17/33] systemd: update 249.6 -> 249.7 [honister,18/33] oeqa/utils/dump: Fix typo [honister,19/33] oeqa/parselogs: Fix quoting [honister,20/33] go: upgrade 1.16.8 -> 1.16.10 [honister,21/33] scripts/checklayer/common.py: Fixed a minor grammatical error [honister,22/33] libtool: Update patchset to match those submitted upstream [honister,23/33] libtool: change the default AR_FLAGS from "cru" to "cr" [honister,24/33] vim: fix CVE-2021-3927 and CVE-2021-3928 [honister,25/33] vim: fix CVE-2021-3968 and CVE-2021-3973 [honister,26/33] README.OE-Core.md: update URLs [honister,27/33] recipetool: handle GitLab URLs like we do GitHub [honister,28/33] recipetool: extend curl detection when creating recipes [honister,29/33] boost: allow searching for python310 [honister,30/33] boost: Fix build on arches with no atomics [honister,31/33] patch.py: Initialize git repo before patching [honister,32/33] libdrm: upgrade 2.4.107 -> 2.4.108 [honister,33/33] libdrm: upgrade 2.4.108 -> 2.4.109

Commit Message

Mittal, Anuj Dec. 9, 2021, 1:29 a.m. UTC

From: Richard Purdie <richard.purdie@linuxfoundation.org>

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>
---
 meta/recipes-core/glibc/glibc_2.34.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

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"