From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53B77158083 for ; Thu, 19 Sep 2024 22:57:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87D85E29A5; Thu, 19 Sep 2024 22:57:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6CE54E29A5 for ; Thu, 19 Sep 2024 22:57:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 632923430EE for ; Thu, 19 Sep 2024 22:57:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B9A127DE for ; Thu, 19 Sep 2024 22:57:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1726786639.d56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c X-VCS-Branch: master Date: Thu, 19 Sep 2024 22:57:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c86b8d19-fa58-40c6-84da-b8edeb9fe035 X-Archives-Hash: 8b1be2e3b446507316318db9be2ff00f commit: d56d8f8e35fa4f7b8d65dbd6cd535ad6ac69cc9c Author: Sam James gentoo org> AuthorDate: Thu Sep 19 22:55:44 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 19 22:57:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56d8f8e 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 gentoo.org> eclass/toolchain.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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