summaryrefslogtreecommitdiff
path: root/src/mesa/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/x86')
-rw-r--r--src/mesa/x86/glapi_x86.S14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 4c8044e49c..6727e708c1 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -42,7 +42,7 @@
#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
-#define GLOBL_FN(x) GLOBL x ; .type x,@function
+#define GLOBL_FN(x) GLOBL x ; .type x, function
#else
#define GLOBL_FN(x) GLOBL x
#endif
@@ -60,7 +60,7 @@ GL_PREFIX(fn, fn_alt): \
TEST_L(EAX, EAX) ; \
JE(1f) ; \
JMP(GL_OFFSET(off)) ; \
-1: CALL(get_dispatch) ; \
+1: CALL(_x86_get_dispatch) ; \
JMP(GL_OFFSET(off))
#elif defined(THREADS)
# define GL_STUB(fn,off,fn_alt) \
@@ -87,21 +87,13 @@ SEG_TEXT
#ifdef PTHREADS
EXTERN GLNAME(_glapi_Dispatch)
EXTERN GLNAME(_gl_DispatchTSD)
-#ifdef __PIC__
-EXTERN GLNAME(pthread_getspecific@PLT)
-#else
EXTERN GLNAME(pthread_getspecific)
-#endif
ALIGNTEXT16
-GLNAME(get_dispatch):
+GLNAME(_x86_get_dispatch):
SUB_L(CONST(24), ESP)
PUSH_L(GLNAME(_gl_DispatchTSD))
-#ifdef __PIC__
- CALL(GLNAME(pthread_getspecific@PLT))
-#else
CALL(GLNAME(pthread_getspecific))
-#endif
ADD_L(CONST(28), ESP)
RET
#elif defined(THREADS)