picnoir
/
libglvnd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-glx-x32-assembly' into 'master' 

GLX: Fix assembly stubs for x32

Closes #225

See merge request glvnd/libglvnd!272
This commit is contained in:
Kyle Brenneman 2022-10-06 15:09:48 +00:00
parent 9215f347d2 6c5497e527
commit 58d49d7f1d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GLX/glvnd_genentry.c
View File

@ -65,9 +65,16 @@ extern char glx_entrypoint_end[];
#elif defined(USE_X86_64_ASM)
#define STUB_SIZE 16
#if defined(__ILP32__)
#define STUB_ASM_ARCH(slot) \
"movl (4 * " slot ")+entrypointFunctions(%rip), %eax\n" \
"jmp *%rax\n"
#else // defined(__ILP32__)
#define STUB_ASM_ARCH(slot) \
"movq entrypointFunctions@GOTPCREL(%rip), %rax\n\t" \
"jmp *(8 * " slot ")(%rax)\n"
#endif // defined(__ILP32__)
#elif defined(USE_ARMV7_ASM)