diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-30 19:07:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 19:07:45 +0200 |
| commit | f8094c261792e20c0abab210685248d5dbe3112c (patch) | |
| tree | 4305303287d302915d6f5dad14086abf3b7b66d8 | |
| parent | Merge pull request #857 from lioncash/wlan (diff) | |
| parent | Port #3732 from Citra: "common: Fix compilation on ARM" (diff) | |
| download | yuzu-f8094c261792e20c0abab210685248d5dbe3112c.tar yuzu-f8094c261792e20c0abab210685248d5dbe3112c.tar.gz yuzu-f8094c261792e20c0abab210685248d5dbe3112c.tar.bz2 yuzu-f8094c261792e20c0abab210685248d5dbe3112c.tar.lz yuzu-f8094c261792e20c0abab210685248d5dbe3112c.tar.xz yuzu-f8094c261792e20c0abab210685248d5dbe3112c.tar.zst yuzu-f8094c261792e20c0abab210685248d5dbe3112c.zip | |
| -rw-r--r-- | src/common/common_funcs.h | 4 | ||||
| -rw-r--r-- | src/common/swap.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 93f1c0044..8b0d34da6 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -6,7 +6,7 @@ #include <string> -#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) +#if !defined(ARCHITECTURE_x86_64) #include <cstdlib> // for exit #endif #include "common/common_types.h" @@ -32,8 +32,6 @@ #ifdef ARCHITECTURE_x86_64 #define Crash() __asm__ __volatile__("int $3") -#elif defined(ARCHITECTURE_ARM) -#define Crash() __asm__ __volatile__("trap") #else #define Crash() exit(1) #endif diff --git a/src/common/swap.h b/src/common/swap.h index fc7af4280..32af0b6ac 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -69,7 +69,7 @@ inline u32 swap32(u32 _data) { inline u64 swap64(u64 _data) { return _byteswap_uint64(_data); } -#elif ARCHITECTURE_ARM +#elif defined(ARCHITECTURE_ARM) && (__ARM_ARCH >= 6) inline u16 swap16(u16 _data) { u32 data = _data; __asm__("rev16 %0, %1\n" : "=l"(data) : "l"(data)); |