From ae1d21315c1c9401bc3fe662cb5b4d4f15cc666b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 15 Feb 2020 21:31:31 +0100 Subject: [PATCH] Specialize CATCH_TRAP() for iOS + thumb instruction set combo Fixes #1862 --- src/catch2/catch_debugger.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/catch2/catch_debugger.h b/src/catch2/catch_debugger.h index 8c2abef3..fa9e5afe 100644 --- a/src/catch2/catch_debugger.h +++ b/src/catch2/catch_debugger.h @@ -26,8 +26,10 @@ namespace Catch { #define CATCH_TRAP() __asm__("int $3") #elif defined(__aarch64__) #define CATCH_TRAP() __asm__(".inst 0xd4200000") - #elif defined(__arm__) + #elif defined(__arm__) && !defined(__thumb__) #define CATCH_TRAP() __asm__(".inst 0xe7f001f0") + #elif defined(__arm__) && defined(__thumb__) + #define CATCH_TRAP() __asm__(".inst 0xde01") #endif #elif defined(CATCH_PLATFORM_LINUX)