diff options
| author | Jason Ekstrand <[email protected]> | 2019-10-25 11:31:23 -0500 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2019-10-25 11:31:51 -0500 |
| commit | e2bb7fef94f4ae1236889f0806a7b69988d9db95 (patch) | |
| tree | 19046cc8d67fca01f4cc35818c15433fbd27cccd /src/mapi | |
| parent | 2649609ac540108eb567ddf36bd1ac5ec75691af (diff) | |
Revert "mapi: Inline call x86_current_tls."
This reverts commit e137b3a9b71a2711c1f68c8a8b9c0a7407fbcc4b. It
completely broke 32-bit EGL such that wflinfo can't even run without
crashing.
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/entry_x86_tls.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h index 4b3d6bd02ad..545b5a3c786 100644 --- a/src/mapi/entry_x86_tls.h +++ b/src/mapi/entry_x86_tls.h @@ -56,13 +56,9 @@ __asm__(".balign 16\n" ".balign 16\n" \ func ":" -#define STUB_ASM_CODE(slot) \ - "call 1f\n" \ - "1:\n\t" \ - "popl %eax\n\t" \ - "addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %eax\n\t" \ - "movl " ENTRY_CURRENT_TABLE "@GOTNTPOFF(%eax), %eax\n\t" \ - "movl %gs:(%eax), %eax\n\t" \ +#define STUB_ASM_CODE(slot) \ + "call x86_current_tls\n\t" \ + "movl %gs:(%eax), %eax\n\t" \ "jmp *(4 * " slot ")(%eax)" #define MAPI_TMP_STUB_ASM_GCC |