On Tue, Mar 16, 2021 at 01:26:52PM -0700, Yu, Yu-cheng wrote:

Then, what about moving what I had earlier to vdso.h?
If we don't want __i386__ either, then make it two macros.

vdso.h seems to use CONFIG_X86_{64,32} resp.

+.macro ENDBR
+#ifdef CONFIG_X86_CET

And shouldn't that be CONFIG_X86_IBT ?

+#ifdef __i386__

#ifdef CONFIG_X86_32

+	endbr32
+#else
+	endbr64
+#endif
+#endif
+.endm