diff options
| author |   Sam James <sam@gentoo.org> | 2024-02-23 07:11:07 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-02-23 07:13:47 +0000 |
| commit | 21a25eb278b04b204b043bc23750eec632e3bef0 (patch) | |
| tree | cb7486597691c5df4255345917a94cb7a99c04c4 /sys-libs/glibc | |
| parent | app-editors/vis: Stabilize 0.8-r1 arm, #925294 (diff) | |
| download | gentoo-21a25eb278b04b204b043bc23750eec632e3bef0.tar.gz gentoo-21a25eb278b04b204b043bc23750eec632e3bef0.tar.bz2 gentoo-21a25eb278b04b204b043bc23750eec632e3bef0.zip | |
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@gentoo.org>
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/glibc-2.39.ebuild | 5 | ||||
| -rw-r--r-- | 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 |