From: Jason Ekstrand <jason@jlekstrand.net>
Date: Fri, 25 Oct 2019 16:31:23 +0000 (-0500)
Subject: Revert "mapi: Inline call x86_current_tls."
X-Git-Tag: android-x86-9.0-r1~671
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2bb7fef94f4ae1236889f0806a7b69988d9db95;p=android-x86%2Fexternal-mesa.git

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.
---

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