summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitry Andric <[email protected]>2011-01-25 09:22:12 -0700
committerBrian Paul <[email protected]>2011-01-25 09:22:14 -0700
commit731ec60da3ccb92f5bfb4d6f1bc3c8e712751376 (patch)
tree2356cbbfbb83f0ca6dca458672deb4e6bcb645f7 /src
parent7acb98c67c680a0c8fb24a28d215622f396531a2 (diff)
glapi: adding missing @GOTPCREL qualifer in glapi_x86-64.S
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=33440 NOTE: This is a candidate for the 7.9 and 7.10 branches Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
-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 2fa140dc308..2f65fae43fb 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(%rip), %rdi'
+ print '\tmovq\t_gl_DispatchTSD@GOTPCREL(%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 469fac31ae6..1f4463d31c3 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(%rip), %rdi
+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rdi
jmp pthread_getspecific@PLT
#elif defined(THREADS)