Module: Mesa
Branch: master
Commit: e34834f059c68fc8cc6fc941bbde6d7a460595a7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e34834f059c68fc8cc6fc941bbde6d7a460595a7
Author: Matt Turner <matts...@gmail.com>
Date: Thu Sep 25 17:28:20 2014 -0700
glapi: Inline x86_64_current_tls().
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
---
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 5c03b04..38faccc 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 <string.h>
#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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
