[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Sam James]

commit:     21a25eb278b04b204b043bc23750eec632e3bef0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 07:11:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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