[flac] Update flac to 1.4.2

[timidity41/timidity41.git] / FLAC / src / cpu.c

diff --git a/FLAC/src/cpu.c b/FLAC/src/cpu.c
index 4b1b371..cba0ad0 100644 (file)
--- a/FLAC/src/cpu.c
+++ b/FLAC/src/cpu.c
@@ -57,7 +57,7 @@
 #include <sys/auxv.h>
 #endif
 
-#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM
+#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN && !defined FLAC__NO_ASM
 
 /* these are flags in EDX of CPUID AX=00000001 */
 static const uint32_t FLAC__CPUINFO_X86_CPUID_CMOV    = 0x00008000;
@@ -97,8 +97,6 @@ cpu_have_cpuid(void)
 #if defined FLAC__CPU_X86_64 || defined __i686__ || defined __SSE__ || (defined _M_IX86_FP && _M_IX86_FP > 0)
        /* target CPU does have CPUID instruction */
        return 1;
-#elif defined FLAC__HAS_NASM
-       return FLAC__cpu_have_cpuid_asm_ia32();
 #elif defined __GNUC__ && defined HAVE_CPUID_H
        if (__get_cpuid_max(0, 0) != 0)
                return 1;
@@ -151,9 +149,6 @@ cpuinfo_x86(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint
                __cpuid_count(level, 0, *eax, *ebx, *ecx, *edx);
                return;
        }
-#elif defined FLAC__HAS_NASM && defined FLAC__CPU_IA32
-       FLAC__cpu_info_asm_ia32(level, eax, ebx, ecx, edx);
-       return;
 #endif
        *eax = *ebx = *ecx = *edx = 0;
 }
@@ -163,7 +158,7 @@ cpuinfo_x86(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint
 static void
 x86_cpu_info (FLAC__CPUInfo *info)
 {
-#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM
+#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN && !defined FLAC__NO_ASM
        FLAC__bool x86_osxsave = false;
        FLAC__bool os_avx = false;
        FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx;