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>
(cherry picked from commit b6e3898194)
This commit is contained in:
Sunil K Pandey 2024-02-29 17:57:02 -08:00 committed by Florian Weimer
parent 9883f4304c
commit 7b92f46f04

View File

@ -1199,9 +1199,8 @@ 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 (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL
|| (GLRO(dl_x86_cpu_features).xsave_state_size != 0))
{
if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC))
{
@ -1222,7 +1221,6 @@ no_cpuid:
#endif
}
}
#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL
else
{
#ifdef __x86_64__
@ -1239,7 +1237,6 @@ no_cpuid:
# endif
#endif
}
#endif
#ifdef SHARED
# ifdef __x86_64__