From 0398986e93f6955e9cc6e79c6bc5cb3801d8a48a Mon Sep 17 00:00:00 2001 From: Crypto Sebek Date: Sat, 13 Jan 2024 06:13:14 +0200 Subject: [PATCH 1/2] Fix for aarch64 builds --- crnlib/crn_platform.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crnlib/crn_platform.h b/crnlib/crn_platform.h index 119d406..7e976ed 100644 --- a/crnlib/crn_platform.h +++ b/crnlib/crn_platform.h @@ -60,7 +60,11 @@ const bool c_crnlib_big_endian_platform = !c_crnlib_little_endian_platform; #define CRNLIB_BREAKPOINT DebugBreak(); #define CRNLIB_BUILTIN_EXPECT(c, v) c #elif defined(__GNUC__) -#define CRNLIB_BREAKPOINT asm("int $3"); + #if defined(__aarch64__) + #define CRNLIB_BREAKPOINT __builtin_trap(); + #else + #define CRNLIB_BREAKPOINT asm("int $3"); + #endif #define CRNLIB_BUILTIN_EXPECT(c, v) __builtin_expect(c, v) #else #define CRNLIB_BREAKPOINT From 91a802216f38e6aa628f12653e4e5ef691138c1b Mon Sep 17 00:00:00 2001 From: Crypto Sebek Date: Sat, 13 Jan 2024 10:40:25 +0200 Subject: [PATCH 2/2] Fix for all arm builds --- crnlib/crn_platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crnlib/crn_platform.h b/crnlib/crn_platform.h index 7e976ed..7d5137c 100644 --- a/crnlib/crn_platform.h +++ b/crnlib/crn_platform.h @@ -60,7 +60,7 @@ const bool c_crnlib_big_endian_platform = !c_crnlib_little_endian_platform; #define CRNLIB_BREAKPOINT DebugBreak(); #define CRNLIB_BUILTIN_EXPECT(c, v) c #elif defined(__GNUC__) - #if defined(__aarch64__) + #if defined(__aarch64__) || defined(__arm__) || defined(__ARM_ARCH) #define CRNLIB_BREAKPOINT __builtin_trap(); #else #define CRNLIB_BREAKPOINT asm("int $3");