From 6d1f0328bff15c61d9d4a7e06d924dbcd5b1a4f1 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 16 Sep 2019 21:23:51 +0100 Subject: [PATCH] Improve handling of BLACK_VERIFY on different Clang versions. --- src/blackmisc/verify.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/verify.cpp b/src/blackmisc/verify.cpp index e7c0be713..78e889805 100644 --- a/src/blackmisc/verify.cpp +++ b/src/blackmisc/verify.cpp @@ -21,8 +21,10 @@ #endif #if defined(Q_CC_CLANG) -#if __has_builtin(__builtin_debugger) -#define BLACK_HAS_BUILTIN_DEBUGGER +#if __has_builtin(__builtin_debugtrap) +#define BLACK_BUILTIN_DEBUGTRAP __builtin_debugtrap +#elif __has_builtin(__builtin_debugger) +#define BLACK_BUILTIN_DEBUGTRAP __builtin_debugger #endif #endif @@ -47,8 +49,8 @@ namespace BlackMisc __debugbreak(); return; } -# elif defined(BLACK_HAS_BUILTIN_DEBUGGER) - __builtin_debugger(); +# elif defined(BLACK_BUILTIN_DEBUGTRAP) + BLACK_BUILTIN_DEBUGTRAP(); # elif defined(Q_PROCESSOR_X86) __asm__ volatile("int $0x03"); # elif defined(Q_PROCESSOR_ARM)