From e34834f059c68fc8cc6fc941bbde6d7a460595a7 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 25 Sep 2014 17:28:20 -0700 Subject: [PATCH] glapi: Inline x86_64_current_tls(). Reviewed-by: Ian Romanick --- src/mapi/entry_x86-64_tls.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h index 5c03b045606..38facccc870 100644 --- a/src/mapi/entry_x86-64_tls.h +++ b/src/mapi/entry_x86-64_tls.h @@ -46,13 +46,6 @@ __asm__(".text\n" #ifndef MAPI_MODE_BRIDGE -__asm__("x86_64_current_tls:\n\t" - "movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t" - "ret"); - -extern unsigned long -x86_64_current_tls(); - #include #include "u_execmem.h" @@ -90,7 +83,8 @@ entry_generate(int slot) char *code; mapi_func entry; - addr = x86_64_current_tls(); + __asm__("movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%%rip), %0" + : "=r" (addr)); if ((addr >> 32) != 0xffffffff) return NULL; addr &= 0xffffffff; -- 2.30.2