From b74a6e05bd6d9bcbe1367695cb8c7a8c61f93ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Sat, 29 Mar 2025 02:12:43 -0400
Subject: [PATCH] glapi: fix x86 32-bit asm dispatch regression

shared_glapi_mapi_tmp.h must be included before asm("x86_entry_end:").

Fixes: fae087770a8 - glapi: simplify codegen macros
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34269>
---
 src/mapi/entry_x86_tls.h     | 6 ------
 src/mapi/shared-glapi/core.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h
index ac8b4ce9d47..18d00b2b754 100644
--- a/src/mapi/entry_x86_tls.h
+++ b/src/mapi/entry_x86_tls.h
@@ -73,9 +73,3 @@ __asm__(".balign 16\n"
    "movl _mesa_glapi_tls_Dispatch@GOTNTPOFF(%eax), %eax\n\t" \
    "movl %gs:(%eax), %eax\n\t"                              \
    "jmp *(4 * " slot ")(%eax)"
-
-#ifndef GLX_X86_READONLY_TEXT
-__asm__(".balign 16\n"
-        "x86_entry_end:");
-__asm__(".text");
-#endif /* GLX_X86_READONLY_TEXT */
diff --git a/src/mapi/shared-glapi/core.c b/src/mapi/shared-glapi/core.c
index 32fc363d209..b3b9c3c9508 100644
--- a/src/mapi/shared-glapi/core.c
+++ b/src/mapi/shared-glapi/core.c
@@ -25,6 +25,12 @@ _mesa_noop_entrypoint(const char *name);
 #define MAPI_TMP_STUB_ASM_GCC
 #include "shared_glapi_mapi_tmp.h"
 
+#ifndef GLX_X86_READONLY_TEXT
+__asm__(".balign 16\n"
+        "x86_entry_end:");
+__asm__(".text");
+#endif /* GLX_X86_READONLY_TEXT */
+
 extern unsigned long
 x86_current_tls();