Attachment 142297 Details for Bug 108541 – adapted libglvnd x86 tsd changes

[patch] adapted libglvnd x86 tsd changes

tsd.diff (text/plain), 1.27 KB, created by Jonathan Gray on 2018-10-31 06:48:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Gray

Created: 2018-10-31 06:48:23 UTC

Size: 1.27 KB

patch

obsolete

>Index: entry_x86_tsd.h
>===================================================================
>RCS file: /cvs/xenocara/lib/mesa/src/mapi/entry_x86_tsd.h,v
>retrieving revision 1.1.1.2
>diff -u -p -r1.1.1.2 entry_x86_tsd.h
>--- entry_x86_tsd.h	11 Dec 2016 08:26:03 -0000	1.1.1.2
>+++ entry_x86_tsd.h	31 Oct 2018 06:30:51 -0000
>@@ -31,7 +31,7 @@
> #define HIDDEN
> #endif
> 
>-#define X86_ENTRY_SIZE 32
>+#define X86_ENTRY_SIZE 64
> 
> __asm__(".text\n"
>         ".balign 32\n"
>@@ -44,12 +44,18 @@ __asm__(".text\n"
>    func ":"
> 
> #define STUB_ASM_CODE(slot)         \
>-   "movl " ENTRY_CURRENT_TABLE ", %eax\n\t" \
>+   "push %ebx\n\t"                  \
>+   "call 1f\n\t"                    \
>+   "1:\n\t"                         \
>+   "popl %ebx\n\t"                  \
>+   "addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx\n\t" \
>+   "movl " ENTRY_CURRENT_TABLE "@GOT(%ebx), %eax\n\t" \
>+   "mov (%eax), %eax\n\t"           \
>    "testl %eax, %eax\n\t"           \
>-   "je 1f\n\t"                      \
>-   "jmp *(4 * " slot ")(%eax)\n"    \
>+   "jne 1f\n\t"                     \
>+   "call " ENTRY_CURRENT_TABLE_GET "@PLT\n\t" \
>    "1:\n\t"                         \
>-   "call " ENTRY_CURRENT_TABLE_GET "\n\t" \
>+   "pop %ebx\n\t"                   \
>    "jmp *(4 * " slot ")(%eax)"
> 
> #define MAPI_TMP_STUB_ASM_GCC

Actions: View | Splinter Review

Attachments on bug 108541: 142177 | 142297

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.