lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

x86-64: Don't use SSE resolvers for ISA level 3 or above

Browse Source 
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 <goldstein.w.n@gmail.com>
This commit is contained in:
H.J. Lu
2024-02-28 09:51:14 -08:00
parent 0aac205a81
commit befe2d3c4d
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sysdeps/x86/cpu-features.c
View File

@@ -18,6 +18,7 @@
#include <dl-hwcap.h> #include <dl-hwcap.h>
#include <libc-pointer-arith.h> #include <libc-pointer-arith.h>
#include <isa-level.h>
#include <get-isa-level.h> #include <get-isa-level.h>
#include <cacheinfo.h> #include <cacheinfo.h>
#include <dl-cacheinfo.h> #include <dl-cacheinfo.h>
@@ -1144,7 +1145,9 @@ no_cpuid:
TUNABLE_CALLBACK (set_x86_shstk)); TUNABLE_CALLBACK (set_x86_shstk));
#endif #endif
#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL
if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) if (GLRO(dl_x86_cpu_features).xsave_state_size != 0)
#endif
{ {
if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC))
{ {
@@ -1165,22 +1168,24 @@ no_cpuid:
#endif #endif
} }
} }
#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL
else else
{ {
#ifdef __x86_64__ # ifdef __x86_64__
GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave;
# ifdef SHARED # ifdef SHARED
GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave;
# endif # endif
#else # else
# ifdef SHARED # ifdef SHARED
if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) if (CPU_FEATURE_USABLE_P (cpu_features, FXSR))
GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave;
else else
GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave;
# endif
# endif # endif
#endif
} }
#endif
#ifdef SHARED #ifdef SHARED
# ifdef __x86_64__ # ifdef __x86_64__

15
sysdeps/x86_64/dl-tlsdesc.S
View File

@@ -20,6 +20,7 @@
#include <tls.h> #include <tls.h>
#include <cpu-features-offsets.h> #include <cpu-features-offsets.h>
#include <features-offsets.h> #include <features-offsets.h>
#include <isa-level.h>
#include "tlsdesc.h" #include "tlsdesc.h"
#include "dl-trampoline-save.h" #include "dl-trampoline-save.h"
@@ -79,12 +80,14 @@ _dl_tlsdesc_undefweak:
.size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak
#ifdef SHARED #ifdef SHARED
# define USE_FXSAVE # if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL
# define STATE_SAVE_ALIGNMENT 16 # define USE_FXSAVE
# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave # define STATE_SAVE_ALIGNMENT 16
# include "dl-tlsdesc-dynamic.h" # define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave
# undef _dl_tlsdesc_dynamic # include "dl-tlsdesc-dynamic.h"
# undef USE_FXSAVE # undef _dl_tlsdesc_dynamic
# undef USE_FXSAVE
# endif
# define USE_XSAVE # define USE_XSAVE
# define STATE_SAVE_ALIGNMENT 64 # define STATE_SAVE_ALIGNMENT 64