diff options
| author | Ben Skeggs <[email protected]> | 2008-09-12 20:37:33 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-12 20:37:33 +1000 |
| commit | cbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60 (patch) | |
| tree | e4f67e46334b43f051a0605c7762cac36ad7c1f6 /src/mesa | |
| parent | 522139dd146450edfd3d2f07c627b32512a2c27e (diff) | |
| parent | 81335d0f1760fe172a106f79e81281c1f0d7dedf (diff) | |
Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
Conflicts:
configs/linux-dri
Diffstat (limited to 'src/mesa')
| -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 f8337ff93ee..cb34061b36c 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@GOTPCREL(%rip), %rdi + movq _gl_DispatchTSD(%rip), %rdi jmp pthread_getspecific@PLT #elif defined(THREADS) |