@@ -14,22 +14,26 @@ */ #include "config.h" #include "platform.h" + +#ifdef HAVE_CET_H +# include +#else +# define _CET_ENDBR +#endif .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro GENERATE_LOOKUP name notFound \name: -#ifdef HAVE_ENDBR64 - endbr64 -#endif + _CET_ENDBR testq %rdi, %rdi jz returnNilMethod testb $1, %dil @@ -70,13 +74,11 @@ .size \name, .-\name .endm .macro GENERATE_LOOKUP_SUPER name lookup \name: -#ifdef HAVE_ENDBR64 - endbr64 -#endif + _CET_ENDBR movq %rdi, %r8 movq (%rdi), %rdi testq %rdi, %rdi jz returnNilMethod