Merge pull request #1614 from Sonicadvance1/fix_aarch64_bswap

[AArch64] Workaround builtin byteswap bug.
dolphin-emu · Nov 30, 2014 · 7c38d04 · 7c38d04
2 parents 4a687f2 + c27ee21
commit 7c38d04
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
@@ -194,7 +194,9 @@ inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
 inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;}
 inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;}
 inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);}
-#elif __linux__
+#elif __linux__ && !(ANDROID && _M_ARM_64)
+// Android NDK r10c has broken builtin byte swap routines
+// Disabled for now.
 inline u16 swap16(u16 _data) {return bswap_16(_data);}
 inline u32 swap32(u32 _data) {return bswap_32(_data);}
 inline u64 swap64(u64 _data) {return bswap_64(_data);}