From: Brian Paul <brianp@vmware.com>
Date: Tue, 25 Jan 2011 19:12:34 +0000 (-0700)
Subject: Revert "glapi: adding missing @GOTPCREL qualifer in glapi_x86-64.S"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba0953da5b2440ba19f427ed82266f0dd0cdf96a;p=mesa.git

Revert "glapi: adding missing @GOTPCREL qualifer in glapi_x86-64.S"

This reverts commit 731ec60da3ccb92f5bfb4d6f1bc3c8e712751376.

This change causes crashes in the x86-64 dispatch code.
---

diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py
index 2f65fae43fb..2fa140dc308 100644
--- a/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/src/mapi/glapi/gen/gl_x86-64_asm.py
@@ -166,7 +166,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 		print ''
 		print '\t.p2align\t4,,15'
 		print '_x86_64_get_dispatch:'
-		print '\tmovq\t_gl_DispatchTSD@GOTPCREL(%rip), %rdi'
+		print '\tmovq\t_gl_DispatchTSD(%rip), %rdi'
 		print '\tjmp\tpthread_getspecific@PLT'
 		print ''
 		print '#elif defined(THREADS)'
diff --git a/src/mapi/glapi/glapi_x86-64.S b/src/mapi/glapi/glapi_x86-64.S
index 1f4463d31c3..469fac31ae6 100644
--- a/src/mapi/glapi/glapi_x86-64.S
+++ b/src/mapi/glapi/glapi_x86-64.S
@@ -73,7 +73,7 @@ _x86_64_get_dispatch:
 
 	.p2align	4,,15
 _x86_64_get_dispatch:
-	movq	_gl_DispatchTSD@GOTPCREL(%rip), %rdi
+	movq	_gl_DispatchTSD(%rip), %rdi
 	jmp	pthread_getspecific@PLT
 
 #elif defined(THREADS)