x86-64: Simplify minimum ISA check ifdef conditional with if

Replace minimum ISA check ifdef conditional with if.  Since
MINIMUM_X86_ISA_LEVEL and AVX_X86_ISA_LEVEL are compile time constants,
compiler will perform constant folding optimization, getting same
results.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
This commit is contained in:
Sunil K Pandey 2024-02-29 17:57:02 -08:00
parent d370155b9a
commit b6e3898194

View file

@ -1196,9 +1196,8 @@ no_cpuid:
TUNABLE_CALLBACK (set_x86_shstk)); TUNABLE_CALLBACK (set_x86_shstk));
#endif #endif
#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL
if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) || (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))
{ {
@ -1219,24 +1218,22 @@ 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__