Commit 58d49d7f authored by Kyle Brenneman's avatar Kyle Brenneman
Browse files

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

GLX: Fix assembly stubs for x32

Closes #225

See merge request glvnd/libglvnd!272
parents 9215f347 6c5497e5
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment