tstarr/yuzu
1
0
Fork 0
mirror of https://github.com/starr-dusT/yuzu-mainline synced 2024-03-05 21:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #865 from FearlessTobi/port-3732

Browse Source 
Port #3732 from Citra: "common: Fix compilation on ARM"
This commit is contained in:
bunnei 2018-07-30 10:07:45 -07:00 committed by GitHub
commit f8094c2617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/common_funcs.h
View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) #if !defined(ARCHITECTURE_x86_64)
#include <cstdlib> // for exit #include <cstdlib> // for exit
#endif #endif
#include "common/common_types.h" #include "common/common_types.h"
@ -32,8 +32,6 @@
#ifdef ARCHITECTURE_x86_64 #ifdef ARCHITECTURE_x86_64
#define Crash() __asm__ __volatile__("int $3") #define Crash() __asm__ __volatile__("int $3")
#elif defined(ARCHITECTURE_ARM)
#define Crash() __asm__ __volatile__("trap")
#else #else
#define Crash() exit(1) #define Crash() exit(1)
#endif #endif

2
src/common/swap.h
View File

@ -69,7 +69,7 @@ inline u32 swap32(u32 _data) {
inline u64 swap64(u64 _data) { inline u64 swap64(u64 _data) {
return _byteswap_uint64(_data); return _byteswap_uint64(_data);
} }
#elif ARCHITECTURE_ARM #elif defined(ARCHITECTURE_ARM) && (__ARM_ARCH >= 6)
inline u16 swap16(u16 _data) { inline u16 swap16(u16 _data) {
u32 data = _data; u32 data = _data;
__asm__("rev16 %0, %1\n" : "=l"(data) : "l"(data)); __asm__("rev16 %0, %1\n" : "=l"(data) : "l"(data));