From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id AEEEB3858C3A; Wed, 28 Feb 2024 19:50:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AEEEB3858C3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1709149818; bh=CfJndhwqDq/NFH+2afsKC9Rrr308n5aWCLoo3fMnEqk=; h=From:To:Subject:Date:From; b=K+rOWBcDWFq8vSzCvJigSfn/JfiVKZ2qURbS2uSu5mmh31OR6YMMsZBhusX4yyJgR mRkhhtKhEQLrC3tJCjehN2fTY48HIuxhgxMULIzwM31arWTGOEnZlxTOJbf7ieQPrm AuOhBl6q/bj9YNy+UGuLMYQx9cBRlWwFcganO+GQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: H.J. Lu To: glibc-cvs@sourceware.org Subject: [glibc] x86-64: Don't use SSE resolvers for ISA level 3 or above X-Act-Checkin: glibc X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/master X-Git-Oldrev: 0aac205a814a8511e98d02b91a8dc908f1c53cde X-Git-Newrev: befe2d3c4dec8be2cdd01a47132e47bdb7020922 Message-Id: <20240228195018.AEEEB3858C3A@sourceware.org> Date: Wed, 28 Feb 2024 19:50:18 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=befe2d3c4dec8be2cdd01a47132e47bdb7020922 commit befe2d3c4dec8be2cdd01a47132e47bdb7020922 Author: H.J. Lu Date: Wed Feb 28 09:51:14 2024 -0800 x86-64: Don't use SSE resolvers for ISA level 3 or above When glibc is built with ISA level 3 or above enabled, SSE resolvers aren't available and glibc fails to build: ld: .../elf/librtld.os: in function `init_cpu_features': .../elf/../sysdeps/x86/cpu-features.c:1200:(.text+0x1445f): undefined reference to `_dl_runtime_resolve_fxsave' ld: .../elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object /usr/local/bin/ld: final link failed: bad value For ISA level 3 or above, don't use _dl_runtime_resolve_fxsave nor _dl_tlsdesc_dynamic_fxsave. This fixes BZ #31429. Reviewed-by: Noah Goldstein Diff: --- sysdeps/x86/cpu-features.c | 17 +++++++++++------ sysdeps/x86_64/dl-tlsdesc.S | 15 +++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 835113b42f..0ad0a78f67 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -1144,7 +1145,9 @@ no_cpuid: TUNABLE_CALLBACK (set_x86_shstk)); #endif +#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) +#endif { if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) { @@ -1165,22 +1168,24 @@ no_cpuid: #endif } } +#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL else { -#ifdef __x86_64__ +# ifdef __x86_64__ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; -# ifdef SHARED +# ifdef SHARED GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -# endif -#else -# ifdef SHARED +# endif +# else +# ifdef SHARED if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; else GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; +# endif # endif -#endif } +#endif #ifdef SHARED # ifdef __x86_64__ diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S index ea69f5223a..057a10862a 100644 --- a/sysdeps/x86_64/dl-tlsdesc.S +++ b/sysdeps/x86_64/dl-tlsdesc.S @@ -20,6 +20,7 @@ #include #include #include +#include #include "tlsdesc.h" #include "dl-trampoline-save.h" @@ -79,12 +80,14 @@ _dl_tlsdesc_undefweak: .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak #ifdef SHARED -# define USE_FXSAVE -# define STATE_SAVE_ALIGNMENT 16 -# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -# include "dl-tlsdesc-dynamic.h" -# undef _dl_tlsdesc_dynamic -# undef USE_FXSAVE +# if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL +# define USE_FXSAVE +# define STATE_SAVE_ALIGNMENT 16 +# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave +# include "dl-tlsdesc-dynamic.h" +# undef _dl_tlsdesc_dynamic +# undef USE_FXSAVE +# endif # define USE_XSAVE # define STATE_SAVE_ALIGNMENT 64