fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

glapi: fix x86 32-bit asm dispatch regression
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

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

Fixes: fae087770a - glapi: simplify codegen macros
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34269>
This commit is contained in:
Marek Olšák 2025-03-29 02:12:43 -04:00 • committed by Marge Bot
parent 359f69ba0c
commit b74a6e05bd
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mapi/entry_x86_tls.h
View file

@ -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 */

6
src/mapi/shared-glapi/core.c
View file

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