summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-01-25 12:12:34 -0700
committerBrian Paul <brianp@vmware.com>2011-01-25 12:12:34 -0700
commitba0953da5b2440ba19f427ed82266f0dd0cdf96a (patch)
tree49bc0adef0d205e9a4d829ae5e560c7a31520994
parent40ac24e631e694e00652a2df6c0ac5d0f07f620f (diff)
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.
-rw-r--r--src/mapi/glapi/gen/gl_x86-64_asm.py2
-rw-r--r--src/mapi/glapi/glapi_x86-64.S2
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 2f65fae43f..2fa140dc30 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 1f4463d31c..469fac31ae 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)