From d15c11f42054aa7bff6f2879c1ce22d9ae1dbbaf Mon Sep 17 00:00:00 2001 From: Daniel_Cortez Date: Sun, 29 Oct 2017 21:25:42 +0700 Subject: [PATCH] Fix OPHANDLER_CALL-related warnings issued by clang on non-x86 targets --- source/compiler/sc.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/source/compiler/sc.h b/source/compiler/sc.h index 69c2b27..664ca3c 100644 --- a/source/compiler/sc.h +++ b/source/compiler/sc.h @@ -47,19 +47,14 @@ #if defined _MSC_VER #define OPHANDLER_CALL __fastcall -#elif defined __GNUC__ - #if defined __clang__ +#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__ || defined __amd64__) + #if !defined __x86_64__ && !defined __amd64__ && (__GNUC__>=4 || __GNUC__==3 && __GNUC_MINOR__>=4) #define OPHANDLER_CALL __attribute__((fastcall)) - #elif (defined __i386__ || defined __x86_64__ || defined __amd64__) - #if !defined __x86_64__ && !defined __amd64__ && (__GNUC__>=4 || __GNUC__==3 && __GNUC_MINOR__>=4) - #define OPHANDLER_CALL __attribute__((fastcall)) - #else - #define OPHANDLER_CALL __attribute__((regparam(3))) - #endif #else - #define OPHANDLER_CALL + #define OPHANDLER_CALL __attribute__((regparam(3))) #endif -#else +#endif +#if !defined OPHANDLER_CALL #define OPHANDLER_CALL #endif