qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backout i386 tsd dispatch changes. While they worked for

Browse Source 
glxinfo/glxgears it broke SDL2 GL which dlopens libGL.
This commit is contained in:
jsg 2018-11-10 08:11:16 +00:00
parent 0a0e524477
commit f88a7e92a2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mesa/src/mapi/entry_x86_tsd.h
View File

@ -31,7 +31,7 @@
#define HIDDEN #define HIDDEN
#endif #endif
#define X86_ENTRY_SIZE 64 #define X86_ENTRY_SIZE 32
__asm__(".text\n" __asm__(".text\n"
".balign 32\n" ".balign 32\n"
@ -44,16 +44,12 @@ __asm__(".text\n"
func ":" func ":"
#define STUB_ASM_CODE(slot) \ #define STUB_ASM_CODE(slot) \
"call 1f\n\t" \ "movl " ENTRY_CURRENT_TABLE ", %eax\n\t" \
"1:\n\t" \
"popl %eax\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %eax\n\t" \
"movl " ENTRY_CURRENT_TABLE "@GOT(%eax), %eax\n\t" \
"mov (%eax), %eax\n\t" \
"testl %eax, %eax\n\t" \ "testl %eax, %eax\n\t" \
"jne 1f\n\t" \ "je 1f\n\t" \
"call " ENTRY_CURRENT_TABLE_GET "@PLT\n\t" \ "jmp *(4 * " slot ")(%eax)\n" \
"1:\n\t" \ "1:\n\t" \
"call " ENTRY_CURRENT_TABLE_GET "\n\t" \
"jmp *(4 * " slot ")(%eax)" "jmp *(4 * " slot ")(%eax)"
#define MAPI_TMP_STUB_ASM_GCC #define MAPI_TMP_STUB_ASM_GCC