Fix inline assemble in catch.hpp dependency for ARM Macs (#3118)

* * Fix inline assemble in catch.hpp dependency for ARM Macs See original change in catchorg/Catch2#1127
opensim-org · Jan 17, 2022 · 041ace9 · 041ace9
1 parent 949e0e4
commit 041ace9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/OpenSim/Auxiliary/catch.hpp b/OpenSim/Auxiliary/catch.hpp
@@ -7910,7 +7910,11 @@ namespace Catch {
 
 #ifdef CATCH_PLATFORM_MAC
 
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
 
 #elif defined(CATCH_PLATFORM_IPHONE)
 

diff --git a/Vendors/tropter/external/catch/catch.hpp b/Vendors/tropter/external/catch/catch.hpp
@@ -6011,7 +6011,11 @@ namespace Catch {
 
 #ifdef CATCH_PLATFORM_MAC
 
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
 
 #elif defined(CATCH_PLATFORM_LINUX)
     // If we can use inline assembler, do it because this allows us to break