put back the correct dispatcher for non-threaded builds.

fixed x86 entrypoints for Mingw/DJGPP.

diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 346252b7b620cdc47f9ccd72801e1a33ef4581ff..cb2f6d5b209e9a3021b6f9fee7259cf6b61cbe9b 100644 (file)
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -108,7 +108,7 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase):
                print 'ALIGNTEXT16;\t\t\t\t\t\t\\'
                print 'GLOBL_FN(GL_PREFIX(fn, fn_alt));\t\t\t\\'
                print 'GL_PREFIX(fn, fn_alt):\t\t\t\t\t\\'
-               print '\tMOV_L(CONTENT(GLNAME(_glapi_DispatchTSD)), EAX) ;\t\\'
+               print '\tMOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) ;\t\\'
                print '\tJMP(GL_OFFSET(off))'
                print '#endif'
                print ''
@@ -138,8 +138,8 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase):
                print 'EXTERN GLNAME(_glapi_get_dispatch)'
                print '#endif'
                print ''
-               print '\t\tALIGNTEXT16 ; GLOBL gl_dispatch_functions_start'
-               print 'gl_dispatch_functions_start:'
+               print '\t\tALIGNTEXT16 ; GLOBL GLNAME(gl_dispatch_functions_start)'
+               print 'GLNAME(gl_dispatch_functions_start):'
                print ''
                return
 

diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index bc4aca5abc1b6954528cf8b394abd1959bf3b822..4c8044e49cc400a08dd9d56483e7faa97b3a5ab0 100644 (file)
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -78,7 +78,7 @@ GL_PREFIX(fn, fn_alt):                                        \
 ALIGNTEXT16;                                           \
 GLOBL_FN(GL_PREFIX(fn, fn_alt));                       \
 GL_PREFIX(fn, fn_alt):                                 \
-       MOV_L(CONTENT(GLNAME(_glapi_DispatchTSD)), EAX) ;       \
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) ;  \
        JMP(GL_OFFSET(off))
 #endif
 
@@ -108,8 +108,8 @@ GLNAME(get_dispatch):
 EXTERN GLNAME(_glapi_get_dispatch)
 #endif
 
-               ALIGNTEXT16 ; GLOBL gl_dispatch_functions_start
-gl_dispatch_functions_start:
+               ALIGNTEXT16 ; GLOBL GLNAME(gl_dispatch_functions_start)
+GLNAME(gl_dispatch_functions_start):
 
        GL_STUB(NewList, _gloffset_NewList, NewList@8)
        GL_STUB(EndList, _gloffset_EndList, EndList@0)