diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-30 10:07:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 10:07:45 -0700 |
| commit | f8094c261792e20c0abab210685248d5dbe3112c (patch) | |
| tree | 4305303287d302915d6f5dad14086abf3b7b66d8 /src/common/common_funcs.h | |
| parent | c5fa3560a63e82babea22b148128f1e70fd54d06 (diff) | |
| parent | 1670c4421f6f2c3a08c21d81eef749ec956af65c (diff) | |
Merge pull request #865 from FearlessTobi/port-3732
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 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 |