Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Specialize CATCH_TRAP() for iOS + thumb instruction set combo

Fixes #1862
Commit
ae1d21315c1c9401bc3fe662cb5b4d4f15cc666b
Author
Martin Hořeňovský ·
Parents
6a2c025bfc9f

Files · Download .tar.gz

Changes

 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)