Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-02-15 21:31:31 +0100
committerMartin Hořeňovský2020-02-16 16:11:29 +0100
commitae1d21315c1c9401bc3fe662cb5b4d4f15cc666b (patch)
tree3344d93c0901a76223cace5c40b0fd4b71f6e0cc /src
parent6a2c025bfc9fdac3d99e6f54c790bc04d0ca8174 (diff)
downloadcatch3-ae1d21315c1c9401bc3fe662cb5b4d4f15cc666b.tar.gz
Specialize CATCH_TRAP() for iOS + thumb instruction set combo
Fixes #1862
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_debugger.h4
1 files changed, 3 insertions, 1 deletions
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)