diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-06-29 12:16:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-06-29 12:16:13 +1000 |
| commit | 01de2293d5449ab6ca1d99b007c9ea4f0037fef5 (patch) | |
| tree | 8560aab576c3d8504f8d7935ab6fcd46ea35182e /src/mesa/x86-64 | |
| parent | b831aa06dc0d099185bcaa180683ad10942feaa0 (diff) | |
| parent | 9d94d133b019ef23ee03cc691fcb5602451604ae (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/x86-64')
| -rw-r--r-- | src/mesa/x86-64/glapi_x86-64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S index cb34061b36..f8337ff93e 100644 --- a/src/mesa/x86-64/glapi_x86-64.S +++ b/src/mesa/x86-64/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) |