From edf024592ef508d0655a2e6bec3c1ef08e6ee524 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Sun, 13 May 2018 11:34:45 +0100 Subject: Port #3732 from Citra: "common: Fix compilation on ARM" --- src/common/common_funcs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/common/common_funcs.h') 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 -#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) +#if !defined(ARCHITECTURE_x86_64) #include // 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 -- cgit v1.2.3