diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-11-10 08:11:17 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-11-10 08:11:17 +0000 |
| commit | d8b564febcc0325ab31a296581261b73cd633de2 (patch) | |
| tree | 8ad0714682b57b4511ab24413eb787bd705d16d3 /lib/mesa | |
| parent | 81a606963a477bb9bc971ae28fb72cda375a844b (diff) | |
Backout i386 tsd dispatch changes. While they worked for
glxinfo/glxgears it broke SDL2 GL which dlopens libGL.
Diffstat (limited to 'lib/mesa')
| -rw-r--r-- | lib/mesa/src/mapi/entry_x86_tsd.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/mesa/src/mapi/entry_x86_tsd.h b/lib/mesa/src/mapi/entry_x86_tsd.h index e08a02f3d..0c28c8ff0 100644 --- a/lib/mesa/src/mapi/entry_x86_tsd.h +++ b/lib/mesa/src/mapi/entry_x86_tsd.h @@ -31,7 +31,7 @@ #define HIDDEN #endif -#define X86_ENTRY_SIZE 64 +#define X86_ENTRY_SIZE 32 __asm__(".text\n" ".balign 32\n" @@ -44,16 +44,12 @@ __asm__(".text\n" func ":" #define STUB_ASM_CODE(slot) \ - "call 1f\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" \ + "movl " ENTRY_CURRENT_TABLE ", %eax\n\t" \ "testl %eax, %eax\n\t" \ - "jne 1f\n\t" \ - "call " ENTRY_CURRENT_TABLE_GET "@PLT\n\t" \ + "je 1f\n\t" \ + "jmp *(4 * " slot ")(%eax)\n" \ "1:\n\t" \ + "call " ENTRY_CURRENT_TABLE_GET "\n\t" \ "jmp *(4 * " slot ")(%eax)" #define MAPI_TMP_STUB_ASM_GCC |