diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-23 16:52:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-24 09:55:54 +0000 |
commit | 78bb5ff94300d058bf231e2b03c0464a379e9181 (patch) | |
tree | bb318f59dbbffed4f54650cf91723edbccd044e4 /meta/recipes-core | |
parent | 1a2eccb76e91b5bb568048853f1373b299f6cd8a (diff) | |
download | poky-78bb5ff94300d058bf231e2b03c0464a379e9181.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]
(From OE-Core rev: 26e4fed594daefb6923c50171360f925c4822683)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.34.bb | 2 |
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} \ | |||
90 | 90 | ||
91 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 91 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |
92 | 92 | ||
93 | EXTRA_OECONF:append:x86 = " --enable-cet" | 93 | EXTRA_OECONF:append:x86 = " ${@bb.utils.contains_any('TUNE_FEATURES', 'i586 c3', '--disable-cet', '--enable-cet', d)}" |
94 | EXTRA_OECONF:append:x86-64 = " --enable-cet" | 94 | EXTRA_OECONF:append:x86-64 = " --enable-cet" |
95 | 95 | ||
96 | PACKAGECONFIG ??= "nscd memory-tagging" | 96 | PACKAGECONFIG ??= "nscd memory-tagging" |