@@ -15,16 +15,20 @@
 
 #include "config.h"
 
 .globl _OFForward
 .globl _OFForward_stret
+
+#ifdef HAVE_CET_H
+# include <cet.h>
+#else
+# define _CET_ENDBR
+#endif
 
 .section .text
 _OFForward:
-#ifdef HAVE_ENDBR32
-	endbr32
-#endif
+	_CET_ENDBR
 
 	pushl	%ebp
 	movl	%esp, %ebp
 
 	pushl	%ebx
@@ -83,13 +87,11 @@
 .scl 2
 .type 32
 .endef
 
 _OFForward_stret:
-#ifdef HAVE_ENDBR32
-	endbr32
-#endif
+	_CET_ENDBR
 
 	pushl	%ebp
 	movl	%esp, %ebp
 
 	pushl	%ebx
@@ -148,13 +150,11 @@
 .scl 2
 .type 32
 .endef
 
 init:
-#ifdef HAVE_ENDBR32
-	endbr32
-#endif
+	_CET_ENDBR
 
 	pushl	%ebp
 	movl	%esp, %ebp
 
 	pushl	%ebx