From 5dbd6a821ff753e3b41324c4fb7c58cf65eeea33 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 3 Feb 2021 10:27:42 +0000 Subject: [PATCH] sys-libs/glibc: disable ISA level annotations on >=2.33 Passing -march= causes glibc to add annotations not compatible to run result on -march= as too high ISA level is inferred. ISA level is a new feature of 2.33 release. Until it's fixed let's disable ISA level inference with libc_cv_include_x86_isa_level=no (no better configure option yet). Bug: https://sourceware.org/PR27318 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich --- sys-libs/glibc/glibc-2.33.ebuild | 4 ++++ sys-libs/glibc/glibc-9999.ebuild | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild index ee67def4831dd..a1ee8eff85eff 100644 --- a/sys-libs/glibc/glibc-2.33.ebuild +++ b/sys-libs/glibc/glibc-2.33.ebuild @@ -948,6 +948,10 @@ glibc_do_configure() { # https://bugs.gentoo.org/753740 libc_cv_complocaledir='${exec_prefix}/lib/locale' + # -march= option tricks build system to infer too + # high ISA level: https://sourceware.org/PR27318 + libc_cv_include_x86_isa_level=no + ${EXTRA_ECONF} ) diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 0104a0d723851..fda4b18ea3a26 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -948,6 +948,10 @@ glibc_do_configure() { # https://bugs.gentoo.org/753740 libc_cv_complocaledir='${exec_prefix}/lib/locale' + # -march= option tricks build system to infer too + # high ISA level: https://sourceware.org/PR27318 + libc_cv_include_x86_isa_level=no + ${EXTRA_ECONF} )