x86: Add ENDBR at function entries

[mesa.git] / src / mapi / entry_x86_tsd.h

diff --git a/src/mapi/entry_x86_tsd.h b/src/mapi/entry_x86_tsd.h
index 03d973520feeaeaff5430ca7040ac2a18678663f..1cf3ea2964eaa23f8b9e7d4f787686ff1716f70c 100644 (file)
--- a/src/mapi/entry_x86_tsd.h
+++ b/src/mapi/entry_x86_tsd.h
@@ -25,13 +25,19 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY
+#ifdef __CET__
+#define ENDBR "endbr32\n\t"
+#else
+#define ENDBR
+#endif
+
+#ifdef HAVE_FUNC_ATTRIBUTE_VISIBILITY
 #define HIDDEN __attribute__((visibility("hidden")))
 #else
 #define HIDDEN
 #endif
 
-#define X86_ENTRY_SIZE 32
+#define X86_ENTRY_SIZE 64
 
 __asm__(".text\n"
         ".balign 32\n"
@@ -44,12 +50,20 @@ __asm__(".text\n"
    func ":"
 
 #define STUB_ASM_CODE(slot)         \
-   "movl " ENTRY_CURRENT_TABLE ", %eax\n\t" \
+   ENDBR                            \
+   "call 1f\n\t"                    \
+   "1:\n\t"                         \
+   "popl %ecx\n\t"                  \
+   "addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx\n\t" \
+   "movl " ENTRY_CURRENT_TABLE "@GOT(%ecx), %eax\n\t" \
+   "mov (%eax), %eax\n\t"           \
    "testl %eax, %eax\n\t"           \
-   "je 1f\n\t"                      \
-   "jmp *(4 * " slot ")(%eax)\n"    \
+   "jne 1f\n\t"                     \
+   "push %ebx\n\t"                  \
+   "movl %ecx, %ebx\n\t"            \
+   "call " ENTRY_CURRENT_TABLE_GET "@PLT\n\t" \
+   "popl %ebx\n\t"                  \
    "1:\n\t"                         \
-   "call " ENTRY_CURRENT_TABLE_GET "\n\t" \
    "jmp *(4 * " slot ")(%eax)"
 
 #define MAPI_TMP_STUB_ASM_GCC