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();