@@ -14,19 +14,23 @@
  */
 
 #include "config.h"
 
 #include "platform.h"
+
+#ifdef HAVE_CET_H
+# include <cet.h>
+#else
+# define _CET_ENDBR
+#endif
 
 .globl OFForward
 .globl OFForward_stret
 
 .section .text
 OFForward:
-#ifdef HAVE_ENDBR64
-	endbr64
-#endif
+	_CET_ENDBR
 
 	pushq	%rbp
 	movq	%rsp, %rbp
 
 	/* Save all arguments */
@@ -109,13 +113,11 @@
 	jmp	OFMethodNotFound@PLT
 .type OFForward, %function
 .size OFForward, .-OFForward
 
 OFForward_stret:
-#ifdef HAVE_ENDBR64
-	endbr64
-#endif
+	_CET_ENDBR
 
 	pushq	%rbp
 	movq	%rsp, %rbp
 
 	/* Save all arguments */
@@ -200,13 +202,11 @@
 	jmp	OFMethodNotFound_stret@PLT
 .type OFForward_stret, %function
 .size OFForward_stret, .-OFForward_stret
 
 init:
-#ifdef HAVE_ENDBR64
-	endbr64
-#endif
+	_CET_ENDBR
 
 	leaq	module(%rip), %rdi
 	jmp	__objc_exec_class@PLT
 
 #ifdef OF_SOLARIS