dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-21 08:16:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "dsp/cpu: correct wasmCPUInfo placement"

Browse Source 
This reverts commit 4026e34e3f2edaf4b61824e06994527e45d2b6d8.

fails to build; not all x86 paths were protected

Change-Id: I27bcc83e74440205bfd99c31c6da319c205ef145
This commit is contained in:
James Zern 2017-06-26 15:36:57 -07:00
parent 4026e34e3f
commit 586eda373d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/dsp/cpu.c
View File

@ -22,17 +22,12 @@
#include <cpu-features.h> #include <cpu-features.h>
#endif #endif
// WASM needs to precede platform specific architecture checks as the defines //------------------------------------------------------------------------------
// will still be present when building this target. // SSE2 detection.
#if defined(WEBP_USE_WASM) //
static int wasmCPUInfo(CPUFeature feature) {
if (feature != kWASM) return 0;
return 1;
}
VP8CPUInfo VP8GetCPUInfo = wasmCPUInfo;
// apple/darwin gcc-4.0.1 defines __PIC__, but not __pic__ with -fPIC. // apple/darwin gcc-4.0.1 defines __PIC__, but not __pic__ with -fPIC.
#elif (defined(__pic__) || defined(__PIC__)) && defined(__i386__) #if (defined(__pic__) || defined(__PIC__)) && defined(__i386__)
static WEBP_INLINE void GetCPUInfo(int cpu_info[4], int info_type) { static WEBP_INLINE void GetCPUInfo(int cpu_info[4], int info_type) {
__asm__ volatile ( __asm__ volatile (
"mov %%ebx, %%edi\n" "mov %%ebx, %%edi\n"
@ -222,6 +217,12 @@ static int mipsCPUInfo(CPUFeature feature) {
} }
VP8CPUInfo VP8GetCPUInfo = mipsCPUInfo; VP8CPUInfo VP8GetCPUInfo = mipsCPUInfo;
#elif defined(WEBP_USE_WASM)
static int wasmCPUInfo(CPUFeature feature) {
if (feature != kWASM) return 0;
return 1;
}
VP8CPUInfo VP8GetCPUInfo = wasmCPUInfo;
#else #else
VP8CPUInfo VP8GetCPUInfo = NULL; VP8CPUInfo VP8GetCPUInfo = NULL;
#endif #endif