Commit bd9770ff authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

Only allow SSE2 intrinsics for x86_64.

parent 95552e11
......@@ -430,8 +430,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
#endif
}
#if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
#ifdef FLAC__HAS_X86INTRIN
#if defined FLAC__CPU_X86_64 && defined FLAC__HAS_X86INTRIN
#if defined _MSC_VER && (_MSC_VER >= 1400)
#include <intrin.h> /* for __cpuid() */
......@@ -457,5 +456,4 @@ void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx)
*flags_ecx = *flags_edx = 0;
#endif
}
#endif /* FLAC__HAS_X86INTRIN */
#endif /* FLAC__CPU_IA32 || FLAC__CPU_X86_64 */
#endif /* FLAC__HAS_X86INTRIN && FLAC__CPU_X86_64 */
......@@ -85,19 +85,15 @@ void FLAC__cpu_info(FLAC__CPUInfo *info);
#ifndef FLAC__NO_ASM
#ifdef FLAC__CPU_IA32
#ifdef FLAC__HAS_NASM
#if defined FLAC__CPU_IA32 && defined FLAC__HAS_NASM
FLAC__uint32 FLAC__cpu_have_cpuid_asm_ia32(void);
void FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx);
FLAC__uint32 FLAC__cpu_info_extended_amd_asm_ia32(void);
#endif
#endif
#if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
#ifdef FLAC__HAS_X86INTRIN
#if defined FLAC__CPU_X86_64 && defined FLAC__HAS_X86INTRIN
void FLAC__cpu_info_x86(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx);
#endif
#endif
#endif
......
......@@ -36,8 +36,7 @@
#ifndef FLAC__INTEGER_ONLY_LIBRARY
#ifndef FLAC__NO_ASM
#if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64
#ifdef FLAC__HAS_X86INTRIN
#if defined FLAC__CPU_X86_64 && defined FLAC__HAS_X86INTRIN
#include "FLAC/assert.h"
#include "FLAC/format.h"
......@@ -562,7 +561,6 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC_
}
}
#endif /* FLAC__HAS_X86INTRIN */
#endif /* FLAC__CPU_IA32 || FLAC__CPU_X86_64 */
#endif /* FLAC__CPU_X86_64 && FLAC__HAS_X86INTRIN */
#endif /* FLAC__NO_ASM */
#endif /* FLAC__INTEGER_ONLY_LIBRARY */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment