From 699fc2b8b5ad6728dc2b863734262a1204abb932 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Tue, 16 Apr 2024 08:08:04 +0200 Subject: [PATCH] Add missing CET (Control-flow Enforcement Technology) bits in asm code Adding .note.gnu.property section data. https://git.enlightenment.org/old/legacy-imlib2/issues/23 --- src/lib/asm.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/asm.h b/src/lib/asm.h index 773cd8d..ea96d57 100644 --- a/src/lib/asm.h +++ b/src/lib/asm.h @@ -17,14 +17,15 @@ .size PR_(sym),.-PR_(sym); \ .align 8; -#ifdef __CET__ -#if defined(DO_MMX_ASM) -#define ENDBR_ endbr32 -#elif defined(DO_AMD64_ASM) -#define ENDBR_ endbr64 -#endif -#else #define ENDBR_ +#ifdef __CET__ +#ifdef __has_include +#if __has_include() +#include +#undef ENDBR_ +#define ENDBR_ _CET_ENDBR +#endif +#endif #endif #endif /* __ASM_H */