generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "endian_inl.h: fix mips32 android build"

Browse Source
This commit is contained in:
James Zern 2015-08-06 22:23:39 +00:00 committed by Gerrit Code Review
commit 7914f7a028
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vpx_util/endian_inl.h
View File

@ -63,6 +63,11 @@
#define HAVE_BUILTIN_BSWAP16 #define HAVE_BUILTIN_BSWAP16
#endif #endif
#if HAVE_MIPS32 && defined(__mips__) && !defined(__mips64) && \
defined(__mips_isa_rev) && (__mips_isa_rev >= 2) && (__mips_isa_rev < 6)
#define VPX_USE_MIPS32_R2
#endif
static INLINE uint16_t BSwap16(uint16_t x) { static INLINE uint16_t BSwap16(uint16_t x) {
#if defined(HAVE_BUILTIN_BSWAP16) #if defined(HAVE_BUILTIN_BSWAP16)
return __builtin_bswap16(x); return __builtin_bswap16(x);
@ -75,7 +80,7 @@ static INLINE uint16_t BSwap16(uint16_t x) {
} }
static INLINE uint32_t BSwap32(uint32_t x) { static INLINE uint32_t BSwap32(uint32_t x) {
#if HAVE_MIPS32 #if defined(VPX_USE_MIPS32_R2)
uint32_t ret; uint32_t ret;
__asm__ volatile ( __asm__ volatile (
"wsbh %[ret], %[x] \n\t" "wsbh %[ret], %[x] \n\t"