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 5CE4E158041 for ; Fri, 23 Feb 2024 07:14:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F0042BC02D; Fri, 23 Feb 2024 07:14:26 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 796762BC02D for ; Fri, 23 Feb 2024 07:14:26 +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 79D733431F4 for ; Fri, 23 Feb 2024 07:14:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D246E131B for ; Fri, 23 Feb 2024 07:14:23 +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: <1708672427.21a25eb278b04b204b043bc23750eec632e3bef0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.39.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 21a25eb278b04b204b043bc23750eec632e3bef0 X-VCS-Branch: master Date: Fri, 23 Feb 2024 07:14:23 +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: d9eba5e1-b709-47c4-a230-6f3f0b3d045b X-Archives-Hash: 43b6fcffb943c68ac20cc78bc200aef0 commit: 21a25eb278b04b204b043bc23750eec632e3bef0 Author: Sam James gentoo org> AuthorDate: Fri Feb 23 07:11:07 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 23 07:13:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a25eb2 sys-libs/glibc: disable CET for x86 CET is (now) only supported on amd64 and x32. See a0cfc48e8a67506e3f0b2d3ea5e04b45408b3683 in glibc. While we're here, wire it up for x32. Signed-off-by: Sam James gentoo.org> sys-libs/glibc/glibc-2.39.ebuild | 5 ++--- sys-libs/glibc/glibc-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys-libs/glibc/glibc-2.39.ebuild b/sys-libs/glibc/glibc-2.39.ebuild index 108a4dfa2070..d48d26dff251 100644 --- a/sys-libs/glibc/glibc-2.39.ebuild +++ b/sys-libs/glibc/glibc-2.39.ebuild @@ -988,9 +988,8 @@ glibc_do_configure() { *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;; esac - # Enable Intel Control-flow Enforcement Technology on amd64 if requested - case ${CTARGET} in - x86_64-*) myconf+=( $(use_enable cet) ) ;; + case ${ABI}-${CTARGET} in + amd64-x86_64-*|x32-x86_64-*-*-gnux32) myconf+=( $(use_enable cet) ) ;; *) ;; esac diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 108a4dfa2070..d48d26dff251 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -988,9 +988,8 @@ glibc_do_configure() { *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;; esac - # Enable Intel Control-flow Enforcement Technology on amd64 if requested - case ${CTARGET} in - x86_64-*) myconf+=( $(use_enable cet) ) ;; + case ${ABI}-${CTARGET} in + amd64-x86_64-*|x32-x86_64-*-*-gnux32) myconf+=( $(use_enable cet) ) ;; *) ;; esac