diff options
| author | Cameron Cawley <ccawley2011@gmail.com> | 2018-05-13 11:34:45 +0100 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2018-07-29 15:51:31 +0200 |
| commit | 1670c4421f6f2c3a08c21d81eef749ec956af65c (patch) | |
| tree | 99fa96a5abb1dfb6cb2751faedf7aaecd8fc9280 /src/common/common_funcs.h | |
| parent | 458fdda7005f5c84dad652792254260b01a1f389 (diff) | |
Port #3732 from Citra: "common: Fix compilation on ARM"
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 93f1c00444..8b0d34da6e 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 |