summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-09-19 23:55:44 +0100
committerSam James <sam@gentoo.org>2024-09-19 23:57:19 +0100
commitd56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c (patch)
treeb7ac9ad5e82b1cd582bc434ea3714863ab11cacb /eclass
parentsci-mathematics/lean: bump to 4.11.0 (diff)
downloadgentoo-d56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c.tar.gz
gentoo-d56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c.tar.bz2
gentoo-d56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c.zip
toolchain.eclass: disable automagic CET for x86
It's not supported on 32-bit kernels anyway. This got lost in b6bf005b843e3d6ee10aa1f088d93c4f89055cc6 when wiring up arm64. Bug: https://bugs.gentoo.org/916381 Closes: https://bugs.gentoo.org/939874 Fixes: b6bf005b843e3d6ee10aa1f088d93c4f89055cc6 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a545f730ada7..0557db974035 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1310,7 +1310,9 @@ toolchain_src_configure() {
fi
if in_iuse cet ; then
- [[ ${CTARGET} == x86_64-*-gnu* ]] && confgcc+=( $(use_enable cet) )
+ if [[ ${CTARGET} == i[[34567]]86-*-linux* || ${CTARGET} == x86_64-*-gnu* ]] ; then
+ confgcc+=( $(use_enable cet) )
+ fi
[[ ${CTARGET} == aarch64-*-gnu* ]] && confgcc+=( $(use_enable cet standard-branch-protection) )
fi