claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

libFLAC/cpu.c: Get rid of OS_IS_ANDROID function

Browse Source
This commit is contained in:
Julian Calaby
2016-06-27 22:13:30 +10:00
committed by Erik de Castro Lopo
parent 828e33b38f
commit 078c631d73
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libFLAC/cpu.c
View File

@@ -63,12 +63,6 @@
# include <cpuid.h> /* for __get_cpuid() and __get_cpuid_max() */
#endif
#if defined(__ANDROID__) || defined(ANDROID)
#define OS_IS_ANDROID 1
#else
#define OS_IS_ANDROID 0
#endif
#ifdef DEBUG
#include <stdio.h>
@@ -176,18 +170,15 @@ ia32_cpu_info (FLAC__CPUInfo *info)
#if !defined FLAC__CPU_IA32
(void) info;
return;
#elif defined(__ANDROID__) || defined(ANDROID)
/* no need to check OS SSE support */
info->use_asm = true;
return;
#else
FLAC__bool ia32_fxsr = false;
FLAC__bool ia32_osxsave = false;
FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx;
if (OS_IS_ANDROID) {
/* no need to check OS SSE support */
info->use_asm = true;
return;
}
#if !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN)
info->use_asm = true; /* we assume a minimum of 80386 with FLAC__CPU_IA32 */
#if !FLAC__HAS_X86INTRIN
@@ -367,17 +358,14 @@ x86_64_cpu_info (FLAC__CPUInfo *info)
#if !defined FLAC__CPU_X86_64
(void) info;
return;
#elif defined(__ANDROID__) || defined(ANDROID)
/* no need to check OS SSE support */
info->use_asm = true;
return;
#else
FLAC__bool x86_osxsave = false;
FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx;
if (OS_IS_ANDROID) {
/* no need to check OS SSE support */
info->use_asm = true;
return;
}
#if !defined FLAC__NO_ASM && FLAC__HAS_X86INTRIN
info->use_asm = true;