Mesa (master): Revert "mapi: Inline call x86_current_tls."
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 25 16:32:08 UTC 2019
Module: Mesa
Branch: master
Commit: e2bb7fef94f4ae1236889f0806a7b69988d9db95
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2bb7fef94f4ae1236889f0806a7b69988d9db95
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Fri Oct 25 11:31:23 2019 -0500
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.
---
src/mapi/entry_x86_tls.h | 10 +++-------
1 file 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
More information about the mesa-commit
mailing list