Mesa (master): Revert "glapi: adding missing @ GOTPCREL qualifer in glapi_x86-64.S"

Brian Paul brianp at kemper.freedesktop.org
Tue Jan 25 19:13:03 UTC 2011


Module: Mesa
Branch: master
Commit: ba0953da5b2440ba19f427ed82266f0dd0cdf96a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba0953da5b2440ba19f427ed82266f0dd0cdf96a

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan 25 12:12:34 2011 -0700

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.

---

 src/mapi/glapi/gen/gl_x86-64_asm.py |    2 +-
 src/mapi/glapi/glapi_x86-64.S       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py
index 2f65fae..2fa140d 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 at GOTPCREL(%rip), %rdi'
+		print '\tmovq\t_gl_DispatchTSD(%rip), %rdi'
 		print '\tjmp\tpthread_getspecific at 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 1f4463d..469fac3 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 at GOTPCREL(%rip), %rdi
+	movq	_gl_DispatchTSD(%rip), %rdi
 	jmp	pthread_getspecific at PLT
 
 #elif defined(THREADS)




More information about the mesa-commit mailing list