Mesa version 6.2.1MESA

97 files changed, 3356 insertions, 2785 deletions

diff --git a/extras/Mesa/Makefile b/extras/Mesa/Makefile
index e683669e4..dd5cb1ac6 100644
--- a/extras/Mesa/Makefile
+++ b/extras/Mesa/Makefile
@@ -52,6 +52,8 @@ beos \
 darwin \
 darwin-static \
 freebsd \
+freebsd-dri \
+freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
@@ -115,9 +117,9 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.2
-LIB_NAME = MesaLib-6.2
-DEMO_NAME = MesaDemos-6.2
+DIRECTORY = Mesa-6.2.1
+LIB_NAME = MesaLib-6.2.1
+DEMO_NAME = MesaDemos-6.2.1
 
 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
diff --git a/extras/Mesa/bin/mklib b/extras/Mesa/bin/mklib
index 59dd0096f..2f6beff7c 100755
--- a/extras/Mesa/bin/mklib
+++ b/extras/Mesa/bin/mklib
@@ -116,6 +116,14 @@ case $ARCH in
     'Linux' | 'OpenBSD')
 	# GCC-based environment
 
+	# Set default compilers if env vars not set
+	if [ "x$CXX" = "x" ] ; then
+	    CXX=g++
+	fi
+	if [ "x$CC" = "x" ] ; then
+	    CC=gcc
+	fi
+
 	if [ $NOPREFIX = 1 ] ; then
 	    # No "lib" or ".so" part
 	    echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
diff --git a/extras/Mesa/configs/default b/extras/Mesa/configs/default
index dc6192ad8..30c64744f 100644
--- a/extras/Mesa/configs/default
+++ b/extras/Mesa/configs/default
@@ -8,7 +8,7 @@ CONFIG_NAME = default
 # Version info
 MESA_MAJOR=6
 MESA_MINOR=2
-MESA_TINY=0
+MESA_TINY=1
 
 # external projects
 DRM_SOURCE_PATH=$(TOP)/../drm
diff --git a/extras/Mesa/configs/freebsd-dri b/extras/Mesa/configs/freebsd-dri
new file mode 100644
index 000000000..a718ded57
--- /dev/null
+++ b/extras/Mesa/configs/freebsd-dri
@@ -0,0 +1,39 @@
+# -*-makefile-*-
+# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
+
+include $(TOP)/configs/freebsd
+
+CONFIG_NAME = freebsd-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O
+
+CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC
+
+ASM_SOURCES = 
+
+# Library/program dependencies
+DRI_LIB_DEPS = -lm -lpthread -lexpat
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
+
+GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
+
+
+# Directories
+SRC_DIRS = mesa glu glut/glx glw glx/x11
+DRIVER_DIRS = dri
+PROGRAM_DIRS = 
+WINDOW_SYSTEM=dri
+
+DRM_SOURCE_PATH=$(TOP)/../drm
+
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
+	   unichrome savage sis
+
diff --git a/extras/Mesa/configs/freebsd-dri-x86 b/extras/Mesa/configs/freebsd-dri-x86
new file mode 100644
index 000000000..31316b1f7
--- /dev/null
+++ b/extras/Mesa/configs/freebsd-dri-x86
@@ -0,0 +1,12 @@
+# -*-makefile-*-
+# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
+
+include $(TOP)/configs/freebsd-dri
+
+CONFIG_NAME = freebsd-dri-x86
+
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
+
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES = $(X86_SOURCES)
diff --git a/extras/Mesa/configs/osf1 b/extras/Mesa/configs/osf1
index a738b2771..bc88c2042 100644
--- a/extras/Mesa/configs/osf1
+++ b/extras/Mesa/configs/osf1
@@ -13,6 +13,4 @@ CXXFLAGS = -O2 -std ansi -ieee
 GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm
-
-
+APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
diff --git a/extras/Mesa/docs/RELNOTES-6.2.1 b/extras/Mesa/docs/RELNOTES-6.2.1
new file mode 100644
index 000000000..789e92b24
--- /dev/null
+++ b/extras/Mesa/docs/RELNOTES-6.2.1
@@ -0,0 +1,50 @@
+
+                           Mesa 6.2.1 release notes
+
+                              December 9, 2004
+
+                              PLEASE READ!!!!
+
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.1) designate new developmental releases.
+Even numbered versions (such as 6.2.x) designate stable releases.
+
+
+This release primarily just fixes bugs found in the Mesa 6.2 release.
+See the VERSIONS file for details.
+
+
+
+Known Issues
+------------
+
+The GL_EXT_pixel_buffer_object extension isn't fully implemented for
+functions like glPolygonStipple, glConvolutionFilter, glColorTable,
+etc.  The important functions like glRead/DrawPixels, glTex[Sub]Image,
+and glBitmap work with PBOs.  This has been fixed for Mesa 6.3.
+
+
+
+
+Driver			Status
+----------------------	---------------------
+XMesa (Xlib)		implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			implements OpenGL 1.3
+Wind River UGL		implements OpenGL 1.3
+Windows/Win32		implements OpenGL 1.5
+DJGPP			implements OpenGL 1.5
+GGI			implements OpenGL 1.3
+BeOS			implements OpenGL 1.5
+Allegro			needs updating
+D3D			needs updating
+
+
+----------------------------------------------------------------------
+$Id$
diff --git a/extras/Mesa/docs/VERSIONS b/extras/Mesa/docs/VERSIONS
index 65b3a083f..ee2ba4cea 100644
--- a/extras/Mesa/docs/VERSIONS
+++ b/extras/Mesa/docs/VERSIONS
@@ -1295,3 +1295,20 @@ Mesa Version History
 	- spriteblast demo didn't handle window size changes correctly
 	- glTexSubImage didn't handle pixels=NULL correctly for PBOs
 	- fixed color index mode glDrawPixels bug (Karl Schultz)
+
+
+6.2.1  December 9, 2004
+    Bug fixes:
+	- don't apply regular fog or color sum when using a fragment program
+	- glProgramEnvParameter4fARB always generated an error on
+	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
+	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
+	- fixed width/height mix-up in glSeparableFilter2D()
+	- fixed regression in glCopyPixels + convolution
+	- glReadPixels from a clipped front color buffer didn't always work
+	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
+	- Attempting queries/accesses of VBO 0 weren't detected as errors
+	- paletted textures failed if the palette had fewer that 256 entries
+    Changes:
+	- fixed a bunch of compiler warnings found with gcc 3.4
+	- bug reports should to go bugzilla.freedesktop.org
diff --git a/extras/Mesa/docs/bugs.html b/extras/Mesa/docs/bugs.html
index 9ced9dc8c..0ace15138 100644
--- a/extras/Mesa/docs/bugs.html
+++ b/extras/Mesa/docs/bugs.html
@@ -7,9 +7,20 @@
 <H1>Bug Database</H1>
 
 <p>
-Bug reports can be filed in the <a
-href="http://sourceforge.net/bugs/?group_id=3" target="_parent">Bug
-Database</a> on sourceforge.net. Please follow these guidelines:
+The Mesa bug database is now hosted on
+<a href="http://freedesktop.org" target="_parent">freedesktop.org</a>
+instead of SourceForge.
+</p>
+
+<p>
+To file a Mesa bug, go to
+<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"
+target="_parent">
+Bugzilla on freedesktop.org</a>
+</p>
+
+<p>
+Please follow these bug reporting guidelines:
 </p>
 
 <ul>
@@ -21,7 +32,8 @@ Database</a> on sourceforge.net. Please follow these guidelines:
 </ul>
 
 <p>
-Bug reports will automatically be forwarded to the Mesa developer's list.
+Bug reports will automatically be forwarded to the Mesa developer's mailing
+list.
 </p>
 
 <p>
diff --git a/extras/Mesa/docs/libraries.html b/extras/Mesa/docs/libraries.html
index 6494fc721..a7faab613 100644
--- a/extras/Mesa/docs/libraries.html
+++ b/extras/Mesa/docs/libraries.html
@@ -36,7 +36,7 @@ Open SG PLUS</a> - a scene-graph library
 </a> - a scene-graph library
 <li><a href="http://www.openvrml.org/" target="_parent">OpenVRML</a>
 - a VRML parsing/display library with "lookat" - an example VRML browser
-<li><a href="http://www.woodsoup.org/projs/plib" target="_parent">PLIB</a> - A collection of portable games libraries, including an OpenGL GUI and a simple Scene Graph API
+<li><a href="http://plib.sourceforge.net/" target="_parent">PLIB</a> - A collection of portable games libraries, including an OpenGL GUI and a simple Scene Graph API
 <li><a href="ftp://ftp.troll.no/contest/Pryan-1.2.tar.gz" target="_parent">Pryan</a> - an OpenInventor-like toolkit
 <li><a href="http://starship.python.net:9673/crew/da/Code/PyOpenGL" target="_parent">PyOpenGL</a> - OpenGL interface for Python
 <li><a href="http://www.quesa.org/" target="_parent">Quesa</a> - QuickDraw3D-compatible library based on OpenGL, Mesa or Direct3D
diff --git a/extras/Mesa/docs/news.html b/extras/Mesa/docs/news.html
index 23ab89093..3be153bfe 100644
--- a/extras/Mesa/docs/news.html
+++ b/extras/Mesa/docs/news.html
@@ -7,6 +7,35 @@
 <H1>News</H1>
 
 
+<h2>December 9, 2004</h2>
+<p>
+Mesa 6.2.1 has been released.
+This is a stable release which just fixes bugs since the 6.2 release.
+</p>
+<pre>
+    Bug fixes:
+	- don't apply regular fog or color sum when using a fragment program
+	- glProgramEnvParameter4fARB always generated an error on
+	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
+	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
+	- fixed width/height mix-up in glSeparableFilter2D()
+	- fixed regression in glCopyPixels + convolution
+	- glReadPixels from a clipped front color buffer didn't always work
+	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
+	- Attempting queries/accesses of VBO 0 weren't detected as errors
+	- paletted textures failed if the palette had fewer that 256 entries
+    Changes:
+	- fixed a bunch of compiler warnings found with gcc 3.4
+	- bug reports should to go bugzilla.freedesktop.org
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+tbd
+</pre>
+
+
 <h2>October 2, 2004</h2>
 <p>
 Mesa 6.2 has been released.
@@ -32,6 +61,17 @@ This is a stable release which just fixes bugs since the 6.1 release.
 	- glTexSubImage didn't handle pixels=NULL correctly for PBOs
 	- fixed color index mode glDrawPixels bug (Karl Schultz)
 </pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+9e8f34b059272dbb8e1f2c968b33bbf0  MesaLib-6.2.tar.gz
+3d6a6362390b6a37d3cb2e615f3ac7db  MesaLib-6.2.tar.bz2
+6cfd7895d28e695c0dbbed9469564091  MesaLib-6.2.zip
+3e06e33b0809f09855cb60883b8bdfef  MesaDemos-6.2.tar.gz
+9d160009c3dfdb35fe7e4088c9ba8f85  MesaDemos-6.2.tar.bz2
+856f7ec947122eb3c8985ebc2f654dcd  MesaDemos-6.2.zip
+</pre>
 
 
 <h2>August 18, 2004</h2>
diff --git a/extras/Mesa/docs/relnotes.html b/extras/Mesa/docs/relnotes.html
index cb0568911..0c64504d2 100644
--- a/extras/Mesa/docs/relnotes.html
+++ b/extras/Mesa/docs/relnotes.html
@@ -11,6 +11,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<LI><A HREF="RELNOTES-6.2.1">RELNOTES-6.2.1</A>
 <LI><A HREF="RELNOTES-6.2">RELNOTES-6.2</A>
 <LI><A HREF="RELNOTES-6.1">RELNOTES-6.1</A>
 <LI><A HREF="RELNOTES-6.0">RELNOTES-6.0</A>
diff --git a/extras/Mesa/include/GL/glut.h b/extras/Mesa/include/GL/glut.h
index 3a67f1f56..c1b78aa4e 100644
--- a/extras/Mesa/include/GL/glut.h
+++ b/extras/Mesa/include/GL/glut.h
@@ -75,7 +75,7 @@ extern "C" {
    To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */
 
 /* XXX This is from Win32's <process.h> */
-# if !defined(_MSC_VER) && !defined(__cdecl)
+# if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__cdecl)
    /* Define __cdecl for non-Microsoft compilers. */
 #  define __cdecl
 #  define GLUT_DEFINED___CDECL
@@ -108,7 +108,7 @@ extern _CRTIMP void __cdecl exit(int);
    and redifinition of Windows system defs, also removes requirement of
    pretty much any standard windows header from this file */
 
-#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__)
+#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__)
 #	define GLUTAPIENTRY __stdcall
 #else
 #	define GLUTAPIENTRY
@@ -664,7 +664,8 @@ GLUTAPI int GLUTAPIENTRY glutGetModifiers(void);
 GLUTAPI int GLUTAPIENTRY glutLayerGet(GLenum type);
 #endif
 #if (GLUT_API_VERSION >= 5)
-GLUTAPI void * GLUTAPIENTRY glutGetProcAddress(const char *procName);
+typedef void (*GLUTproc)();
+GLUTAPI GLUTproc GLUTAPIENTRY glutGetProcAddress(const char *procName);
 #endif
 
 /* GLUT font sub-API */
diff --git a/extras/Mesa/include/GL/internal/dri_interface.h b/extras/Mesa/include/GL/internal/dri_interface.h
index ced714d43..9c430469b 100644
--- a/extras/Mesa/include/GL/internal/dri_interface.h
+++ b/extras/Mesa/include/GL/internal/dri_interface.h
@@ -149,6 +149,8 @@ typedef GLboolean (* PFNGLXGETDRAWABLEINFOPROC) ( __DRInativeDisplay *dpy, int s
     int * backX, int * backY,
     int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
 
+/* Test for the xf86dri.h header file */
+#ifndef _XF86DRI_H_
 extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
     __DRIid context_id );
 
@@ -157,6 +159,7 @@ extern GLboolean XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
 
 extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, 
     __DRIid drawable);
+#endif
 /*@}*/
 
 
diff --git a/extras/Mesa/progs/demos/Makefile b/extras/Mesa/progs/demos/Makefile
index ff07481a9..b03a5dbaf 100644
--- a/extras/Mesa/progs/demos/Makefile
+++ b/extras/Mesa/progs/demos/Makefile
@@ -7,6 +7,8 @@ INCDIR = $(TOP)/include
 
 OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
 
+OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
+
 LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 PROGS = \
@@ -88,3 +90,8 @@ readtex.h:
 # special case: need the -lOSMesa library:
 osdemo: osdemo.c
 	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
+
+# another special case: need the -lOSMesa32 library:
+osdemo32: osdemo32.c
+	$(CC) -I$(INCDIR) $(CFLAGS) osdemo32.c $(OSMESA32_LIBS) -o $@
+
diff --git a/extras/Mesa/progs/xdemos/glxgears.c b/extras/Mesa/progs/xdemos/glxgears.c
index 59691513e..a82a0b9bc 100644
--- a/extras/Mesa/progs/xdemos/glxgears.c
+++ b/extras/Mesa/progs/xdemos/glxgears.c
@@ -424,6 +424,8 @@ event_loop(Display *dpy, Window win)
 
       /* next frame */
       angle += 2.0;
+      if (angle > 3600.0)
+	angle -= 3600.0;
 
       draw();
       glXSwapBuffers(dpy, win);
diff --git a/extras/Mesa/progs/xdemos/glxpbdemo.c b/extras/Mesa/progs/xdemos/glxpbdemo.c
index 9bdf2ff74..91fd30dca 100644
--- a/extras/Mesa/progs/xdemos/glxpbdemo.c
+++ b/extras/Mesa/progs/xdemos/glxpbdemo.c
@@ -138,7 +138,6 @@ static int
 Setup(int width, int height)
 {
 #if defined(GLX_VERSION_1_3) || defined(GLX_VERSION_1_4)
-   XVisualInfo *visInfo;
    GLXContext glCtx;
 
    /* Open the X display */
@@ -175,7 +174,6 @@ Setup(int width, int height)
    }
    else {
       printf("Error: Couldn't create GLXContext\n");
-      XFree(visInfo);
       XCloseDisplay(gDpy);
       return 0;
    }
@@ -183,7 +181,6 @@ Setup(int width, int height)
    /* Bind context to pbuffer */
    if (!glXMakeCurrent(gDpy, gPBuffer, glCtx)) {
       printf("Error: glXMakeCurrent failed\n");
-      XFree(visInfo);
       XCloseDisplay(gDpy);
       return 0;
    }
diff --git a/extras/Mesa/src/glut/glx/Makefile b/extras/Mesa/src/glut/glx/Makefile
index e725048df..12c873d51 100644
--- a/extras/Mesa/src/glut/glx/Makefile
+++ b/extras/Mesa/src/glut/glx/Makefile
@@ -36,7 +36,6 @@ SOURCES = \
 	glut_dstr.c \
 	glut_event.c \
 	glut_ext.c \
-	glut_fbc.c \
 	glut_fullscrn.c \
 	glut_gamemode.c \
 	glut_get.c \
@@ -105,7 +104,9 @@ clean:
 
 
 depend: $(SOURCES)
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)
+	@ echo "running $(MKDEP)"
+	@ touch depend
+	@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
+		> /dev/null 2>&1
 
 include depend
diff --git a/extras/Mesa/src/glut/glx/glut_ext.c b/extras/Mesa/src/glut/glx/glut_ext.c
index a7a56fbef..922a94b20 100644
--- a/extras/Mesa/src/glut/glx/glut_ext.c
+++ b/extras/Mesa/src/glut/glx/glut_ext.c
@@ -53,145 +53,145 @@ glutExtensionSupported(const char *extension)
 
 struct name_address_pair {
    const char *name;
-   const void *address;
+   const GLUTproc address;
 };
 
 static struct name_address_pair glut_functions[] = {
-   { "glutInit", (const void *) glutInit },
-   { "glutInitDisplayMode", (const void *) glutInitDisplayMode },
-   { "glutInitDisplayString", (const void *) glutInitDisplayString },
-   { "glutInitWindowPosition", (const void *) glutInitWindowPosition },
-   { "glutInitWindowSize", (const void *) glutInitWindowSize },
-   { "glutMainLoop", (const void *) glutMainLoop },
-   { "glutCreateWindow", (const void *) glutCreateWindow },
-   { "glutCreateSubWindow", (const void *) glutCreateSubWindow },
-   { "glutDestroyWindow", (const void *) glutDestroyWindow },
-   { "glutPostRedisplay", (const void *) glutPostRedisplay },
-   { "glutPostWindowRedisplay", (const void *) glutPostWindowRedisplay },
-   { "glutSwapBuffers", (const void *) glutSwapBuffers },
-   { "glutGetWindow", (const void *) glutGetWindow },
-   { "glutSetWindow", (const void *) glutSetWindow },
-   { "glutSetWindowTitle", (const void *) glutSetWindowTitle },
-   { "glutSetIconTitle", (const void *) glutSetIconTitle },
-   { "glutPositionWindow", (const void *) glutPositionWindow },
-   { "glutReshapeWindow", (const void *) glutReshapeWindow },
-   { "glutPopWindow", (const void *) glutPopWindow },
-   { "glutPushWindow", (const void *) glutPushWindow },
-   { "glutIconifyWindow", (const void *) glutIconifyWindow },
-   { "glutShowWindow", (const void *) glutShowWindow },
-   { "glutHideWindow", (const void *) glutHideWindow },
-   { "glutFullScreen", (const void *) glutFullScreen },
-   { "glutSetCursor", (const void *) glutSetCursor },
-   { "glutWarpPointer", (const void *) glutWarpPointer },
-   { "glutEstablishOverlay", (const void *) glutEstablishOverlay },
-   { "glutRemoveOverlay", (const void *) glutRemoveOverlay },
-   { "glutUseLayer", (const void *) glutUseLayer },
-   { "glutPostOverlayRedisplay", (const void *) glutPostOverlayRedisplay },
-   { "glutPostWindowOverlayRedisplay", (const void *) glutPostWindowOverlayRedisplay },
-   { "glutShowOverlay", (const void *) glutShowOverlay },
-   { "glutHideOverlay", (const void *) glutHideOverlay },
-   { "glutCreateMenu", (const void *) glutCreateMenu },
-   { "glutDestroyMenu", (const void *) glutDestroyMenu },
-   { "glutGetMenu", (const void *) glutGetMenu },
-   { "glutSetMenu", (const void *) glutSetMenu },
-   { "glutAddMenuEntry", (const void *) glutAddMenuEntry },
-   { "glutAddSubMenu", (const void *) glutAddSubMenu },
-   { "glutChangeToMenuEntry", (const void *) glutChangeToMenuEntry },
-   { "glutChangeToSubMenu", (const void *) glutChangeToSubMenu },
-   { "glutRemoveMenuItem", (const void *) glutRemoveMenuItem },
-   { "glutAttachMenu", (const void *) glutAttachMenu },
-   { "glutDetachMenu", (const void *) glutDetachMenu },
-   { "glutDisplayFunc", (const void *) glutDisplayFunc },
-   { "glutReshapeFunc", (const void *) glutReshapeFunc },
-   { "glutKeyboardFunc", (const void *) glutKeyboardFunc },
-   { "glutMouseFunc", (const void *) glutMouseFunc },
-   { "glutMotionFunc", (const void *) glutMotionFunc },
-   { "glutPassiveMotionFunc", (const void *) glutPassiveMotionFunc },
-   { "glutEntryFunc", (const void *) glutEntryFunc },
-   { "glutVisibilityFunc", (const void *) glutVisibilityFunc },
-   { "glutIdleFunc", (const void *) glutIdleFunc },
-   { "glutTimerFunc", (const void *) glutTimerFunc },
-   { "glutMenuStateFunc", (const void *) glutMenuStateFunc },
-   { "glutSpecialFunc", (const void *) glutSpecialFunc },
-   { "glutSpaceballMotionFunc", (const void *) glutSpaceballMotionFunc },
-   { "glutSpaceballRotateFunc", (const void *) glutSpaceballRotateFunc },
-   { "glutSpaceballButtonFunc", (const void *) glutSpaceballButtonFunc },
-   { "glutButtonBoxFunc", (const void *) glutButtonBoxFunc },
-   { "glutDialsFunc", (const void *) glutDialsFunc },
-   { "glutTabletMotionFunc", (const void *) glutTabletMotionFunc },
-   { "glutTabletButtonFunc", (const void *) glutTabletButtonFunc },
-   { "glutMenuStatusFunc", (const void *) glutMenuStatusFunc },
-   { "glutOverlayDisplayFunc", (const void *) glutOverlayDisplayFunc },
-   { "glutWindowStatusFunc", (const void *) glutWindowStatusFunc },
-   { "glutKeyboardUpFunc", (const void *) glutKeyboardUpFunc },
-   { "glutSpecialUpFunc", (const void *) glutSpecialUpFunc },
-   { "glutJoystickFunc", (const void *) glutJoystickFunc },
-   { "glutSetColor", (const void *) glutSetColor },
-   { "glutGetColor", (const void *) glutGetColor },
-   { "glutCopyColormap", (const void *) glutCopyColormap },
-   { "glutGet", (const void *) glutGet },
-   { "glutDeviceGet", (const void *) glutDeviceGet },
-   { "glutExtensionSupported", (const void *) glutExtensionSupported },
-   { "glutGetModifiers", (const void *) glutGetModifiers },
-   { "glutLayerGet", (const void *) glutLayerGet },
-   { "glutGetProcAddress", (const void *) glutGetProcAddress },
-   { "glutBitmapCharacter", (const void *) glutBitmapCharacter },
-   { "glutBitmapWidth", (const void *) glutBitmapWidth },
-   { "glutStrokeCharacter", (const void *) glutStrokeCharacter },
-   { "glutStrokeWidth", (const void *) glutStrokeWidth },
-   { "glutBitmapLength", (const void *) glutBitmapLength },
-   { "glutStrokeLength", (const void *) glutStrokeLength },
-   { "glutWireSphere", (const void *) glutWireSphere },
-   { "glutSolidSphere", (const void *) glutSolidSphere },
-   { "glutWireCone", (const void *) glutWireCone },
-   { "glutSolidCone", (const void *) glutSolidCone },
-   { "glutWireCube", (const void *) glutWireCube },
-   { "glutSolidCube", (const void *) glutSolidCube },
-   { "glutWireTorus", (const void *) glutWireTorus },
-   { "glutSolidTorus", (const void *) glutSolidTorus },
-   { "glutWireDodecahedron", (const void *) glutWireDodecahedron },
-   { "glutSolidDodecahedron", (const void *) glutSolidDodecahedron },
-   { "glutWireTeapot", (const void *) glutWireTeapot },
-   { "glutSolidTeapot", (const void *) glutSolidTeapot },
-   { "glutWireOctahedron", (const void *) glutWireOctahedron },
-   { "glutSolidOctahedron", (const void *) glutSolidOctahedron },
-   { "glutWireTetrahedron", (const void *) glutWireTetrahedron },
-   { "glutSolidTetrahedron", (const void *) glutSolidTetrahedron },
-   { "glutWireIcosahedron", (const void *) glutWireIcosahedron },
-   { "glutSolidIcosahedron", (const void *) glutSolidIcosahedron },
-   { "glutVideoResizeGet", (const void *) glutVideoResizeGet },
-   { "glutSetupVideoResizing", (const void *) glutSetupVideoResizing },
-   { "glutStopVideoResizing", (const void *) glutStopVideoResizing },
-   { "glutVideoResize", (const void *) glutVideoResize },
-   { "glutVideoPan", (const void *) glutVideoPan },
-   { "glutReportErrors", (const void *) glutReportErrors },
-   { "glutIgnoreKeyRepeat", (const void *) glutIgnoreKeyRepeat },
-   { "glutSetKeyRepeat", (const void *) glutSetKeyRepeat },
-   { "glutForceJoystickFunc", (const void *) glutForceJoystickFunc },
-   { "glutGameModeString", (const void *) glutGameModeString },
-   { "glutEnterGameMode", (const void *) glutEnterGameMode },
-   { "glutLeaveGameMode", (const void *) glutLeaveGameMode },
-   { "glutGameModeGet", (const void *) glutGameModeGet },
+   { "glutInit", (const GLUTproc) glutInit },
+   { "glutInitDisplayMode", (const GLUTproc) glutInitDisplayMode },
+   { "glutInitDisplayString", (const GLUTproc) glutInitDisplayString },
+   { "glutInitWindowPosition", (const GLUTproc) glutInitWindowPosition },
+   { "glutInitWindowSize", (const GLUTproc) glutInitWindowSize },
+   { "glutMainLoop", (const GLUTproc) glutMainLoop },
+   { "glutCreateWindow", (const GLUTproc) glutCreateWindow },
+   { "glutCreateSubWindow", (const GLUTproc) glutCreateSubWindow },
+   { "glutDestroyWindow", (const GLUTproc) glutDestroyWindow },
+   { "glutPostRedisplay", (const GLUTproc) glutPostRedisplay },
+   { "glutPostWindowRedisplay", (const GLUTproc) glutPostWindowRedisplay },
+   { "glutSwapBuffers", (const GLUTproc) glutSwapBuffers },
+   { "glutGetWindow", (const GLUTproc) glutGetWindow },
+   { "glutSetWindow", (const GLUTproc) glutSetWindow },
+   { "glutSetWindowTitle", (const GLUTproc) glutSetWindowTitle },
+   { "glutSetIconTitle", (const GLUTproc) glutSetIconTitle },
+   { "glutPositionWindow", (const GLUTproc) glutPositionWindow },
+   { "glutReshapeWindow", (const GLUTproc) glutReshapeWindow },
+   { "glutPopWindow", (const GLUTproc) glutPopWindow },
+   { "glutPushWindow", (const GLUTproc) glutPushWindow },
+   { "glutIconifyWindow", (const GLUTproc) glutIconifyWindow },
+   { "glutShowWindow", (const GLUTproc) glutShowWindow },
+   { "glutHideWindow", (const GLUTproc) glutHideWindow },
+   { "glutFullScreen", (const GLUTproc) glutFullScreen },
+   { "glutSetCursor", (const GLUTproc) glutSetCursor },
+   { "glutWarpPointer", (const GLUTproc) glutWarpPointer },
+   { "glutEstablishOverlay", (const GLUTproc) glutEstablishOverlay },
+   { "glutRemoveOverlay", (const GLUTproc) glutRemoveOverlay },
+   { "glutUseLayer", (const GLUTproc) glutUseLayer },
+   { "glutPostOverlayRedisplay", (const GLUTproc) glutPostOverlayRedisplay },
+   { "glutPostWindowOverlayRedisplay", (const GLUTproc) glutPostWindowOverlayRedisplay },
+   { "glutShowOverlay", (const GLUTproc) glutShowOverlay },
+   { "glutHideOverlay", (const GLUTproc) glutHideOverlay },
+   { "glutCreateMenu", (const GLUTproc) glutCreateMenu },
+   { "glutDestroyMenu", (const GLUTproc) glutDestroyMenu },
+   { "glutGetMenu", (const GLUTproc) glutGetMenu },
+   { "glutSetMenu", (const GLUTproc) glutSetMenu },
+   { "glutAddMenuEntry", (const GLUTproc) glutAddMenuEntry },
+   { "glutAddSubMenu", (const GLUTproc) glutAddSubMenu },
+   { "glutChangeToMenuEntry", (const GLUTproc) glutChangeToMenuEntry },
+   { "glutChangeToSubMenu", (const GLUTproc) glutChangeToSubMenu },
+   { "glutRemoveMenuItem", (const GLUTproc) glutRemoveMenuItem },
+   { "glutAttachMenu", (const GLUTproc) glutAttachMenu },
+   { "glutDetachMenu", (const GLUTproc) glutDetachMenu },
+   { "glutDisplayFunc", (const GLUTproc) glutDisplayFunc },
+   { "glutReshapeFunc", (const GLUTproc) glutReshapeFunc },
+   { "glutKeyboardFunc", (const GLUTproc) glutKeyboardFunc },
+   { "glutMouseFunc", (const GLUTproc) glutMouseFunc },
+   { "glutMotionFunc", (const GLUTproc) glutMotionFunc },
+   { "glutPassiveMotionFunc", (const GLUTproc) glutPassiveMotionFunc },
+   { "glutEntryFunc", (const GLUTproc) glutEntryFunc },
+   { "glutVisibilityFunc", (const GLUTproc) glutVisibilityFunc },
+   { "glutIdleFunc", (const GLUTproc) glutIdleFunc },
+   { "glutTimerFunc", (const GLUTproc) glutTimerFunc },
+   { "glutMenuStateFunc", (const GLUTproc) glutMenuStateFunc },
+   { "glutSpecialFunc", (const GLUTproc) glutSpecialFunc },
+   { "glutSpaceballMotionFunc", (const GLUTproc) glutSpaceballMotionFunc },
+   { "glutSpaceballRotateFunc", (const GLUTproc) glutSpaceballRotateFunc },
+   { "glutSpaceballButtonFunc", (const GLUTproc) glutSpaceballButtonFunc },
+   { "glutButtonBoxFunc", (const GLUTproc) glutButtonBoxFunc },
+   { "glutDialsFunc", (const GLUTproc) glutDialsFunc },
+   { "glutTabletMotionFunc", (const GLUTproc) glutTabletMotionFunc },
+   { "glutTabletButtonFunc", (const GLUTproc) glutTabletButtonFunc },
+   { "glutMenuStatusFunc", (const GLUTproc) glutMenuStatusFunc },
+   { "glutOverlayDisplayFunc", (const GLUTproc) glutOverlayDisplayFunc },
+   { "glutWindowStatusFunc", (const GLUTproc) glutWindowStatusFunc },
+   { "glutKeyboardUpFunc", (const GLUTproc) glutKeyboardUpFunc },
+   { "glutSpecialUpFunc", (const GLUTproc) glutSpecialUpFunc },
+   { "glutJoystickFunc", (const GLUTproc) glutJoystickFunc },
+   { "glutSetColor", (const GLUTproc) glutSetColor },
+   { "glutGetColor", (const GLUTproc) glutGetColor },
+   { "glutCopyColormap", (const GLUTproc) glutCopyColormap },
+   { "glutGet", (const GLUTproc) glutGet },
+   { "glutDeviceGet", (const GLUTproc) glutDeviceGet },
+   { "glutExtensionSupported", (const GLUTproc) glutExtensionSupported },
+   { "glutGetModifiers", (const GLUTproc) glutGetModifiers },
+   { "glutLayerGet", (const GLUTproc) glutLayerGet },
+   { "glutGetProcAddress", (const GLUTproc) glutGetProcAddress },
+   { "glutBitmapCharacter", (const GLUTproc) glutBitmapCharacter },
+   { "glutBitmapWidth", (const GLUTproc) glutBitmapWidth },
+   { "glutStrokeCharacter", (const GLUTproc) glutStrokeCharacter },
+   { "glutStrokeWidth", (const GLUTproc) glutStrokeWidth },
+   { "glutBitmapLength", (const GLUTproc) glutBitmapLength },
+   { "glutStrokeLength", (const GLUTproc) glutStrokeLength },
+   { "glutWireSphere", (const GLUTproc) glutWireSphere },
+   { "glutSolidSphere", (const GLUTproc) glutSolidSphere },
+   { "glutWireCone", (const GLUTproc) glutWireCone },
+   { "glutSolidCone", (const GLUTproc) glutSolidCone },
+   { "glutWireCube", (const GLUTproc) glutWireCube },
+   { "glutSolidCube", (const GLUTproc) glutSolidCube },
+   { "glutWireTorus", (const GLUTproc) glutWireTorus },
+   { "glutSolidTorus", (const GLUTproc) glutSolidTorus },
+   { "glutWireDodecahedron", (const GLUTproc) glutWireDodecahedron },
+   { "glutSolidDodecahedron", (const GLUTproc) glutSolidDodecahedron },
+   { "glutWireTeapot", (const GLUTproc) glutWireTeapot },
+   { "glutSolidTeapot", (const GLUTproc) glutSolidTeapot },
+   { "glutWireOctahedron", (const GLUTproc) glutWireOctahedron },
+   { "glutSolidOctahedron", (const GLUTproc) glutSolidOctahedron },
+   { "glutWireTetrahedron", (const GLUTproc) glutWireTetrahedron },
+   { "glutSolidTetrahedron", (const GLUTproc) glutSolidTetrahedron },
+   { "glutWireIcosahedron", (const GLUTproc) glutWireIcosahedron },
+   { "glutSolidIcosahedron", (const GLUTproc) glutSolidIcosahedron },
+   { "glutVideoResizeGet", (const GLUTproc) glutVideoResizeGet },
+   { "glutSetupVideoResizing", (const GLUTproc) glutSetupVideoResizing },
+   { "glutStopVideoResizing", (const GLUTproc) glutStopVideoResizing },
+   { "glutVideoResize", (const GLUTproc) glutVideoResize },
+   { "glutVideoPan", (const GLUTproc) glutVideoPan },
+   { "glutReportErrors", (const GLUTproc) glutReportErrors },
+   { "glutIgnoreKeyRepeat", (const GLUTproc) glutIgnoreKeyRepeat },
+   { "glutSetKeyRepeat", (const GLUTproc) glutSetKeyRepeat },
+   { "glutForceJoystickFunc", (const GLUTproc) glutForceJoystickFunc },
+   { "glutGameModeString", (const GLUTproc) glutGameModeString },
+   { "glutEnterGameMode", (const GLUTproc) glutEnterGameMode },
+   { "glutLeaveGameMode", (const GLUTproc) glutLeaveGameMode },
+   { "glutGameModeGet", (const GLUTproc) glutGameModeGet },
    { NULL, NULL }
 };   
 
 
 /* XXX This isn't an official GLUT function, yet */
-void * GLUTAPIENTRY 
+GLUTproc GLUTAPIENTRY 
 glutGetProcAddress(const char *procName)
 {
    /* Try GLUT functions first */
    int i;
    for (i = 0; glut_functions[i].name; i++) {
       if (strcmp(glut_functions[i].name, procName) == 0)
-         return (void *) glut_functions[i].address;
+         return glut_functions[i].address;
    }
 
    /* Try core GL functions */
 #if defined(_WIN32)
-  return (void *) wglGetProcAddress((LPCSTR) procName);
+  return (GLUTproc) wglGetProcAddress((LPCSTR) procName);
 #elif defined(GLX_ARB_get_proc_address)
-  return (void *) glXGetProcAddressARB((const GLubyte *) procName);
+  return (GLUTproc) glXGetProcAddressARB((const GLubyte *) procName);
 #else
   return NULL;
 #endif
diff --git a/extras/Mesa/src/mesa/Makefile b/extras/Mesa/src/mesa/Makefile
index b4819090d..87279eed1 100644
--- a/extras/Mesa/src/mesa/Makefile
+++ b/extras/Mesa/src/mesa/Makefile
@@ -176,7 +176,7 @@ tags:
 
 clean:
 	-rm -f */*.o
-	-rm -f depend mesa.a
+	-rm -f depend depend.bak mesa.a
 	-rm -f drivers/*/*.o
 	(cd drivers/dri ; $(MAKE) clean)
 
diff --git a/extras/Mesa/src/mesa/drivers/dri/Makefile.template b/extras/Mesa/src/mesa/drivers/dri/Makefile.template
index 75c62af0f..517e00632 100644
--- a/extras/Mesa/src/mesa/drivers/dri/Makefile.template
+++ b/extras/Mesa/src/mesa/drivers/dri/Makefile.template
@@ -95,6 +95,7 @@ tags:
 
 # Remove .o and backup files
 clean:
-	-rm -f *.o */*.o *~ *.o *~ *.so server/*.o $(SYMLINKS) depend
+	-rm -f *.o */*.o *~ *.o *~ *.so server/*.o $(SYMLINKS)
+	-rm -f depend depend.bak
 
 include depend
diff --git a/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c b/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
index dd83080cc..88caa34e9 100644
--- a/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
+++ b/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
@@ -141,6 +141,26 @@ __driUtilMessage(const char *f, ...)
     }
 }
 
+/*
+ * fd.o bug #1713: Some rare libGL's have __glXFindDRIScreen defined but do not
+ * export it via glXGetProcAddress.  These are not supported anymore, so print
+ * an error message to that effect.  - ajax 2004-10-26
+ */
+typedef __DRIscreen *(*PFNGLXFINDDRISCREEN)(__DRInativeDisplay *, int);
+
+static __DRIscreen *glx_find_dri_screen(__DRInativeDisplay *d, int i)
+{
+    PFNGLXFINDDRISCREEN findscreen = 
+        (PFNGLXFINDDRISCREEN)glXGetProcAddress("__glXFindDRIScreen");
+
+    if (!findscreen)
+    {
+        __driUtilMessage("glXGetProcAddress(\"__glXFindDRIScreen\") failed!");
+        __driUtilMessage("Your libGL is too old, please upgrade.");
+        return NULL;
+    }
+    else return findscreen(d, i);
+}
 
 /*****************************************************************/
 /** \name Visual utility functions                               */
@@ -212,23 +232,33 @@ static GLboolean __driAddDrawable(void *drawHash, __DRIdrawable *pdraw)
 static __DRIdrawable *__driFindDrawable(void *drawHash, __DRIid draw)
 {
     int retcode;
-    __DRIdrawable *pdraw;
+    union 
+    {
+	__DRIdrawable *pdraw;
+	void *ptr;
+    } p;
 
-    retcode = drmHashLookup(drawHash, draw, (void **)&pdraw);
+    retcode = drmHashLookup(drawHash, draw, &p.ptr);
     if (retcode)
 	return NULL;
 
-    return pdraw;
+    return p.pdraw;
 }
 
 static void __driRemoveDrawable(void *drawHash, __DRIdrawable *pdraw)
 {
     int retcode;
-    __DRIdrawablePrivate *pdp = (__DRIdrawablePrivate *)pdraw->private;
+    union 
+    {
+	__DRIdrawablePrivate *pdp;
+	void *ptr;
+    } p;
+
+    p.pdp = (__DRIdrawablePrivate *)pdraw->private;
 
-    retcode = drmHashLookup(drawHash, pdp->draw, (void **)&pdraw);
+    retcode = drmHashLookup(drawHash, p.pdp->draw, &p.ptr);
     if (!retcode) { /* Found */
-	drmHashDelete(drawHash, pdp->draw);
+	drmHashDelete(drawHash, p.pdp->draw);
     }
 }
 
@@ -286,21 +316,25 @@ static GLboolean __driWindowExists(Display *dpy, GLXDrawable draw)
 static void __driGarbageCollectDrawables(void *drawHash)
 {
     __DRIid draw;
-    __DRIdrawable *pdraw;
     __DRInativeDisplay *dpy;
+    union 
+    {
+	__DRIdrawable *pdraw;
+	void *ptr;
+    } p;
 
-    if (drmHashFirst(drawHash, &draw, (void **)&pdraw)) {
+    if (drmHashFirst(drawHash, &draw, &p.ptr)) {
 	do {
-	    __DRIdrawablePrivate *pdp = (__DRIdrawablePrivate *)pdraw->private;
+	    __DRIdrawablePrivate *pdp = (__DRIdrawablePrivate *)p.pdraw->private;
 	    dpy = pdp->driScreenPriv->display;
 	    if (! (*window_exists)(dpy, draw)) {
 		/* Destroy the local drawable data in the hash table, if the
 		   drawable no longer exists in the Xserver */
-		__driRemoveDrawable(drawHash, pdraw);
-		(*pdraw->destroyDrawable)(dpy, pdraw->private);
-		_mesa_free(pdraw);
+		__driRemoveDrawable(drawHash, p.pdraw);
+		(*p.pdraw->destroyDrawable)(dpy, p.pdraw->private);
+		_mesa_free(p.pdraw);
 	    }
-	} while (drmHashNext(drawHash, &draw, (void **)&pdraw));
+	} while (drmHashNext(drawHash, &draw, &p.ptr));
     }
 }
 
@@ -353,7 +387,7 @@ static GLboolean driUnbindContext3(__DRInativeDisplay *dpy, int scrn,
 	return GL_FALSE;
     }
 
-    pDRIScreen = __glXFindDRIScreen(dpy, scrn);
+    pDRIScreen = glx_find_dri_screen(dpy, scrn);
     if ( (pDRIScreen == NULL) || (pDRIScreen->private == NULL) ) {
 	/* ERROR!!! */
 	return GL_FALSE;
@@ -529,7 +563,7 @@ static GLboolean driBindContext3(__DRInativeDisplay *dpy, int scrn,
 	return GL_FALSE;
     }
 
-    pDRIScreen = __glXFindDRIScreen(dpy, scrn);
+    pDRIScreen = glx_find_dri_screen(dpy, scrn);
     if ( (pDRIScreen == NULL) || (pDRIScreen->private == NULL) ) {
 	/* ERROR!!! */
 	return GL_FALSE;
@@ -563,7 +597,7 @@ static GLboolean driBindContext2(Display *dpy, int scrn,
 	return GL_FALSE;
     }
 
-    pDRIScreen = __glXFindDRIScreen(dpy, scrn);
+    pDRIScreen = glx_find_dri_screen(dpy, scrn);
     modes = (driCompareGLXAPIVersion( 20040317 ) >= 0)
 	? gc->driContext.mode
 	: findConfigMode( dpy, scrn, gc->vid, pDRIScreen );
@@ -793,7 +827,7 @@ static void *driCreateNewDrawable(__DRInativeDisplay *dpy,
 				  int renderType,
 				  const int *attrs)
 {
-    __DRIscreen * const pDRIScreen = __glXFindDRIScreen(dpy, modes->screen);
+    __DRIscreen * const pDRIScreen = glx_find_dri_screen(dpy, modes->screen);
     __DRIscreenPrivate *psp;
     __DRIdrawablePrivate *pdp;
 
@@ -848,7 +882,7 @@ static void *driCreateNewDrawable(__DRInativeDisplay *dpy,
 	_mesa_free(pdp);
 	return NULL;
 #else
-	pdp->getInfo = XF86DRIGetDrawableInfo;
+	pdp->getInfo = (PFNGLXGETDRAWABLEINFOPROC) XF86DRIGetDrawableInfo;
 #endif /* DRI_NEW_INTERFACE_ONLY */
     }
 
@@ -988,7 +1022,7 @@ driCreateNewContext(__DRInativeDisplay *dpy, const __GLcontextModes *modes,
     __DRIscreenPrivate *psp;
     void * const shareCtx = (pshare != NULL) ? pshare->driverPrivate : NULL;
 
-    pDRIScreen = __glXFindDRIScreen(dpy, modes->screen);
+    pDRIScreen = glx_find_dri_screen(dpy, modes->screen);
     if ( (pDRIScreen == NULL) || (pDRIScreen->private == NULL) ) {
 	/* ERROR!!! */
 	return NULL;
@@ -1033,16 +1067,16 @@ driCreateNewContext(__DRInativeDisplay *dpy, const __GLcontextModes *modes,
     pctx->bindContext3   = driBindContext3;
     pctx->unbindContext3 = driUnbindContext3;
 #else
-    pctx->bindContext    = driBindContext;
-    pctx->unbindContext  = driUnbindContext;
+    pctx->bindContext    = (void *)driBindContext;
+    pctx->unbindContext  = (void *)driUnbindContext;
     if ( driCompareGLXAPIVersion( 20030606 ) >= 0 ) {
-        pctx->bindContext2   = driBindContext2;
-        pctx->unbindContext2 = driUnbindContext2;
+        pctx->bindContext2   = (void *)driBindContext2;
+        pctx->unbindContext2 = (void *)driUnbindContext2;
     }
 
     if ( driCompareGLXAPIVersion( 20040415 ) >= 0 ) {
-        pctx->bindContext3   = driBindContext3;
-        pctx->unbindContext3 = driUnbindContext3;
+        pctx->bindContext3   = (void *)driBindContext3;
+        pctx->unbindContext3 = (void *)driUnbindContext3;
     }
 #endif
 
@@ -1088,7 +1122,7 @@ static void *driCreateContext(Display *dpy, XVisualInfo *vis,
     __DRIscreen *pDRIScreen;
     const __GLcontextModes *modes;
 
-    pDRIScreen = __glXFindDRIScreen(dpy, vis->screen);
+    pDRIScreen = glx_find_dri_screen(dpy, vis->screen);
     if ( (pDRIScreen == NULL) || (pDRIScreen->private == NULL) ) {
 	/* ERROR!!! */
 	return NULL;
diff --git a/extras/Mesa/src/mesa/drivers/dri/common/dri_util.h b/extras/Mesa/src/mesa/drivers/dri/common/dri_util.h
index cdb657637..f85a2fb68 100644
--- a/extras/Mesa/src/mesa/drivers/dri/common/dri_util.h
+++ b/extras/Mesa/src/mesa/drivers/dri/common/dri_util.h
@@ -558,8 +558,11 @@ extern float
 driCalculateSwapUsage( __DRIdrawablePrivate *dPriv,
 		       int64_t last_swap_ust, int64_t current_ust );
 
+/* Test for the GLX header glx.h */
+#ifndef GLX
 extern void 
 (*glXGetProcAddress(const GLubyte *procname))( void );
+#endif
 
 #endif /* GLX_DIRECT_RENDERING */
 
diff --git a/extras/Mesa/src/mesa/drivers/dri/common/mmio.h b/extras/Mesa/src/mesa/drivers/dri/common/mmio.h
new file mode 100644
index 000000000..1418543dc
--- /dev/null
+++ b/extras/Mesa/src/mesa/drivers/dri/common/mmio.h
@@ -0,0 +1,63 @@
+/*
+ * (C) Copyright IBM Corporation 2004
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file mmio.h
+ * Functions for properly handling memory mapped IO on various platforms.
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+
+#ifndef MMIO_H
+#define MMIO_H
+
+#include <inttypes.h>
+
+#if defined( __powerpc__ )
+
+static __inline__ uint32_t
+read_MMIO_LE32( volatile void * base, unsigned long offset )
+{
+   volatile void * p = ((volatile char *) base) + offset;
+   uint32_t val;
+   
+   __asm__ __volatile__( "lwbrx	%0, %1, %2 ; eieio"
+			 : "=r" (val)
+			 : "b" (base), "r" (offset), "m" (p) );
+   return val;
+}
+
+#else
+
+static __inline__ uint32_t
+read_MMIO_LE32( volatile void * base, unsigned long offset )
+{
+   volatile uint32_t * p = (volatile uint32_t *) (((volatile char *) base) + offset);
+   return LE32_TO_CPU( p[0] );
+}
+
+#endif
+
+#endif /* MMIO_H */
diff --git a/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c b/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
index 8eb82a889..b635894fe 100644
--- a/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
@@ -49,6 +49,10 @@
 #undef GET_PROGRAM_NAME
 
 #if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__)
+#    if !defined(__GLIBC__) || (__GLIBC__ < 2)
+/* These aren't declared in any libc5 header */
+extern char *program_invocation_name, *program_invocation_short_name;
+#    endif
 #    define GET_PROGRAM_NAME() program_invocation_short_name
 #elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)
 #    include <osreldate.h>
@@ -256,7 +260,7 @@ static GLfloat strToF (const XML_Char *string, const XML_Char **tail) {
     string = numStart;
 
     /* scale of the first digit */
-    scale = sign * powf (10.0f, (GLfloat)(pointPos-1 + exponent));
+    scale = sign * (GLfloat)pow (10.0, (GLdouble)(pointPos-1 + exponent));
 
     /* second pass: parse digits */
     do {
diff --git a/extras/Mesa/src/mesa/drivers/dri/dri_client/Makefile b/extras/Mesa/src/mesa/drivers/dri/dri_client/Makefile
index ae4bf3055..35a7ed4cd 100644
--- a/extras/Mesa/src/mesa/drivers/dri/dri_client/Makefile
+++ b/extras/Mesa/src/mesa/drivers/dri/dri_client/Makefile
@@ -53,6 +53,6 @@ dri.a:	$(OBJECTS)
 
 # Remove .o and backup files
 clean:
-	-rm -f *.o */*.o *~ *.so *.a
+	-rm -f *.o */*.o *~ *.so *.a depend depend.bak
 
 include depend
diff --git a/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c b/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c
index d9fc02501..1eb887f67 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c
@@ -43,6 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "swrast/swrast.h"
 
 #include "vblank.h"
+#include "mmio.h"
 
 #define R128_TIMEOUT        2048
 #define R128_IDLE_RETRY       32
@@ -225,12 +226,11 @@ static void delay( void ) {
 static int r128WaitForFrameCompletion( r128ContextPtr rmesa )
 {
    unsigned char *R128MMIO = rmesa->r128Screen->mmio.map;
-   uint32_t frame;
    int i;
    int wait = 0;
 
    while ( 1 ) {
-      frame = *(volatile unsigned int *)(R128MMIO + R128_LAST_FRAME_REG);
+      uint32_t frame = read_MMIO_LE32( R128MMIO, R128_LAST_FRAME_REG );
 
       if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) {
 	 break;
diff --git a/extras/Mesa/src/mesa/drivers/dri/r128/r128_tris.c b/extras/Mesa/src/mesa/drivers/dri/r128/r128_tris.c
index 34d7c7ffe..0f9245345 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r128/r128_tris.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r128/r128_tris.c
@@ -585,10 +585,16 @@ static void r128RenderStart( GLcontext *ctx )
       EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_3F_VIEWPORT, 0, 12 );
 
    rmesa->coloroffset = offset;
+#if MESA_LITTLE_ENDIAN 
    EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA,
       R128_CCE_VC_FRMT_DIFFUSE_ARGB, 4 );
+#else
+   EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_ARGB,
+      R128_CCE_VC_FRMT_DIFFUSE_ARGB, 4 );
+#endif
 
    if ( index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG) ) {
+#if MESA_LITTLE_ENDIAN
       if ( index & _TNL_BIT_COLOR1) {
 	 rmesa->specoffset = offset;
 	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB,
@@ -601,6 +607,20 @@ static void r128RenderStart( GLcontext *ctx )
 		    1 );
       else
 	 EMIT_PAD( 1 );
+#else
+      if (index & _TNL_BIT_FOG)
+	 EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1UB_1F, R128_CCE_VC_FRMT_SPEC_FRGB,
+		    1 );
+      else
+	 EMIT_PAD( 1 );
+
+      if ( index & _TNL_BIT_COLOR1) {
+	 rmesa->specoffset = offset;
+	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB,
+	    R128_CCE_VC_FRMT_SPEC_FRGB, 3 );
+      } else 
+	 EMIT_PAD( 3 );
+#endif
    }
 
    if ( index & _TNL_BIT_TEX(0) ) {
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.c
index d5ca2f9b3..6c7a9b106 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_context.c
@@ -143,7 +143,6 @@ static const char * const card_extensions[] =
     "GL_ATI_texture_env_combine3",
     "GL_ATI_texture_mirror_once",
     "GL_MESA_pack_invert",
-    "GL_MESA_ycbcr_texture",
     "GL_NV_blend_square",
     "GL_SGIS_generate_mipmap",
     NULL
@@ -401,6 +400,11 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
    _math_matrix_set_identity( &rmesa->tmpmat );
 
    driInitExtensions( ctx, card_extensions, GL_TRUE );
+   if (rmesa->r200Screen->chipset & R200_CHIPSET_REAL_R200) {
+   /* yuv textures only work with r200 chips for unknown reasons, the
+      others get the bit ordering right but don't actually do YUV-RGB conversion */
+      _mesa_enable_extension( ctx, "GL_MESA_ycbcr_texture" );
+   }
    if (rmesa->r200Screen->drmSupportsCubeMaps)
       _mesa_enable_extension( ctx, "GL_ARB_texture_cube_map" );
    if (rmesa->r200Screen->drmSupportsBlendColor) {
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c
index e338e5b35..840a145da 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c
@@ -91,7 +91,8 @@ static const GLuint __driNConfigOptions = 13;
 #define PCI_CHIP_R200_QG	0x5147
 #define PCI_CHIP_R200_QY	0x5159
 #define PCI_CHIP_R200_QZ	0x515A
-#define PCI_CHIP_R200_LW	0x4C57 
+#define PCI_CHIP_R200_LW	0x4C57
+#define PCI_CHIP_R200_LX	0x4C58
 #define PCI_CHIP_R200_LY	0x4C59
 #define PCI_CHIP_R200_LZ	0x4C5A
 #define PCI_CHIP_RV200_QW	0x5157 /* Radeon 7500 - not an R200 at all */
@@ -116,8 +117,14 @@ static const GLuint __driNConfigOptions = 13;
 #define PCI_CHIP_R200_QM        0x514D
 #define PCI_CHIP_R200_QN        0x514E
 #define PCI_CHIP_R200_QO        0x514F /* r200 (non-derived) end */
-/* are the R200 Qh (0x5168) and following needed too? They are not in xf86PciInfo.h
-   but in the pci database. Maybe just secondary ports or something ? */
+/* are the R200 Qh (0x5168) and following needed too? They are not in
+   xf86PciInfo.h but in the pci database. Maybe just secondary ports or
+   something ? Ah well, better be safe than sorry */
+#define PCI_CHIP_R200_Qh        0x5168
+#define PCI_CHIP_R200_Qi        0x5169
+#define PCI_CHIP_R200_Qj        0x516A
+#define PCI_CHIP_R200_Qk        0x516B
+#define PCI_CHIP_R200_Ql        0x516C
 
 #endif
 
@@ -241,6 +248,7 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
    case PCI_CHIP_RV200_QW:
    case PCI_CHIP_RV200_QX:
    case PCI_CHIP_R200_LW:
+   case PCI_CHIP_R200_LX:
    case PCI_CHIP_R200_LY:
    case PCI_CHIP_R200_LZ:
    case PCI_CHIP_RS100_4136:
@@ -269,6 +277,11 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
    case PCI_CHIP_R200_QM:
    case PCI_CHIP_R200_QN:
    case PCI_CHIP_R200_QO:
+   case PCI_CHIP_R200_Qh:
+   case PCI_CHIP_R200_Qi:
+   case PCI_CHIP_R200_Qj:
+   case PCI_CHIP_R200_Qk:
+   case PCI_CHIP_R200_Ql:
       screen->chipset |= R200_CHIPSET_REAL_R200;
    /* fallthrough */
    default:
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_span.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_span.c
index e1ad976ce..aa54e1628 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_span.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_span.c
@@ -195,7 +195,7 @@ static GLuint r200_mba_z32( r200ContextPtr rmesa,
 				       GLint x, GLint y )
 {
    GLuint pitch = rmesa->r200Screen->frontPitch;
-   GLuint b = ((y & 0x3FF) >> 4) * ((pitch & 0xFFF) >> 5) + ((x & 0x3FF) >> 5);
+   GLuint b = ((y & 0x7FF) >> 4) * ((pitch & 0xFFF) >> 5) + ((x & 0x7FF) >> 5);
    GLuint a = 
       (BIT(x,0) << 2) |
       (BIT(y,0) << 3) |
@@ -214,7 +214,7 @@ static GLuint r200_mba_z32( r200ContextPtr rmesa,
 static GLuint r200_mba_z16( r200ContextPtr rmesa, GLint x, GLint y )
 {
    GLuint pitch = rmesa->r200Screen->frontPitch;
-   GLuint b = ((y & 0x3FF) >> 4) * ((pitch & 0xFFF) >> 6) + ((x & 0x3FF) >> 6);
+   GLuint b = ((y & 0x7FF) >> 4) * ((pitch & 0xFFF) >> 6) + ((x & 0x7FF) >> 6);
    GLuint a = 
       (BIT(x,0) << 1) |
       (BIT(y,0) << 2) |
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c
index 66662bb4d..18e0b8510 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -117,12 +117,17 @@ static void r200SetVertexFormat( GLcontext *ctx )
    }
 
    rmesa->swtcl.coloroffset = offset;
+#if MESA_LITTLE_ENDIAN 
    EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, (R200_VTX_PK_RGBA << R200_VTX_COLOR_0_SHIFT) );
+#else
+   EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_ABGR, (R200_VTX_PK_RGBA << R200_VTX_COLOR_0_SHIFT) );
+#endif
    offset += 1;
 
    rmesa->swtcl.specoffset = 0;
    if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) {
 
+#if MESA_LITTLE_ENDIAN 
       if (index & _TNL_BIT_COLOR1) {
 	 rmesa->swtcl.specoffset = offset;
 	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, (R200_VTX_PK_RGBA << R200_VTX_COLOR_1_SHIFT) );
@@ -137,6 +142,22 @@ static void r200SetVertexFormat( GLcontext *ctx )
       else {
 	 EMIT_PAD( 1 );
       }
+#else
+      if (index & _TNL_BIT_FOG) {
+	 EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1UB_1F, (R200_VTX_PK_RGBA << R200_VTX_COLOR_1_SHIFT) );
+      }
+      else {
+	 EMIT_PAD( 1 );
+      }
+
+      if (index & _TNL_BIT_COLOR1) {
+	 rmesa->swtcl.specoffset = offset;
+	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, (R200_VTX_PK_RGBA << R200_VTX_COLOR_1_SHIFT) );
+      }
+      else {
+	 EMIT_PAD( 3 );
+      }
+#endif
    }
 
    if (index & _TNL_BITS_TEX_ANY) {
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
index 746cdb477..80035bc6d 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
@@ -177,11 +177,11 @@ while (0)
  * discrete and there are no intervening state changes.  (Somewhat
  * duplicates changes to DrawArrays code)
  */
-static void EMIT_PRIM( GLcontext *ctx, 
-		       GLenum prim, 
-		       GLuint hwprim, 
-		       GLuint start, 
-		       GLuint count)	
+static void r200EmitPrim( GLcontext *ctx, 
+		          GLenum prim, 
+		          GLuint hwprim, 
+		          GLuint start, 
+		          GLuint count)	
 {
    r200ContextPtr rmesa = R200_CONTEXT( ctx );
    r200TclPrimitive( ctx, prim, hwprim );
@@ -201,7 +201,9 @@ static void EMIT_PRIM( GLcontext *ctx,
 		     count - start );
 }
 
-
+#define EMIT_PRIM(ctx, prim, hwprim, start, count) do {         \
+   r200EmitPrim( ctx, prim, hwprim, start, count );             \
+   (void) rmesa; } while (0)
 
 /* Try & join small primitives
  */
@@ -221,9 +223,12 @@ static void EMIT_PRIM( GLcontext *ctx,
 #define EMIT_ELT(dest, offset, x) do {                                \
         int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 );     \
         GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 );    \
-        (des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); } while (0)
+        (des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x);	\
+	(void)rmesa; } while (0)
 #else
-#define EMIT_ELT(dest, offset, x) (dest)[offset] = (GLushort) (x)
+#define EMIT_ELT(dest, offset, x) do {				\
+	(dest)[offset] = (GLushort) (x);			\
+	(void)rmesa; } while (0)
 #endif
 
 #define EMIT_TWO_ELTS(dest, offset, x, y)  *(GLuint *)((dest)+offset) = ((y)<<16)|(x);
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_texmem.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_texmem.c
index b219995c3..bc937ce6c 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_texmem.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_texmem.c
@@ -382,6 +382,14 @@ static void uploadSubImage( r200ContextPtr rmesa, r200TexObjPtr t,
    /* copy (x,y,width,height,data) */
    memcpy( &tmp, &t->image[face][hwlevel], sizeof(tmp) );
 
+   /* Adjust the base offset to account for the Y-offset.  This is done,
+    * instead of just letting the Y-offset automatically take care of it,
+    * because it is possible, for very large textures, for the Y-offset
+    * to exceede the [-8192,+8191] range.
+    */
+   tex.offset += tmp.y * 1024;
+   tmp.y = 0;
+    
    LOCK_HARDWARE( rmesa );
    do {
       ret = drmCommandWriteRead( rmesa->dri.fd, DRM_RADEON_TEXTURE,
diff --git a/extras/Mesa/src/mesa/drivers/dri/r200/r200_texstate.c b/extras/Mesa/src/mesa/drivers/dri/r200/r200_texstate.c
index 003c1e3e4..a84292e5b 100644
--- a/extras/Mesa/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/extras/Mesa/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -999,7 +999,7 @@ static void disable_tex( GLcontext *ctx, int unit )
 					   R200_TEX_BLEND_0_ENABLE) << unit);
       rmesa->hw.ctx.cmd[CTX_PP_CNTL] |= R200_TEX_BLEND_0_ENABLE; 
 	 
-      R200_STATECHANGE( rmesa, tcl );
+      R200_STATECHANGE( rmesa, vtx );
       rmesa->hw.vtx.cmd[VTX_TCL_OUTPUT_VTXFMT_1] &= ~(7 << (unit * 3));
 	 
       if (rmesa->TclFallback & (R200_TCL_FALLBACK_TEXGEN_0<<unit)) {
@@ -1335,8 +1335,14 @@ void r200UpdateTextureState( GLcontext *ctx )
        * Texture cache LRU hang workaround -------------
        * not needed for r200 derivatives?
        */
-      dbg = 0x0;
 
+      /* While the cases below attempt to only enable the workaround in the
+       * specific cases necessary, they were insufficient.  See bugzilla #1519,
+       * #729, #814.  Tests with quake3 showed no impact on performance.
+       */
+      dbg = 0x6;
+
+      /*
       if (((rmesa->hw.ctx.cmd[CTX_PP_CNTL] & (R200_TEX_0_ENABLE )) &&
          ((((rmesa->hw.tex[0].cmd[TEX_PP_TXFILTER] & R200_MIN_FILTER_MASK)) &
          0x04) == 0)) ||
@@ -1361,7 +1367,7 @@ void r200UpdateTextureState( GLcontext *ctx )
          0x04) == 0)))
       {
          dbg |= 0x04;
-      }
+      }*/
 
       if (dbg != rmesa->hw.tam.cmd[TAM_DEBUG3]) {
          R200_STATECHANGE( rmesa, tam );
diff --git a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c
index 50d515401..aa982cfef 100644
--- a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c
@@ -62,11 +62,26 @@ static void radeonWaitForIdle( radeonContextPtr rmesa );
 static int radeonFlushCmdBufLocked( radeonContextPtr rmesa, 
 				    const char * caller );
 
+static void print_state_atom( struct radeon_state_atom *state )
+{
+   int i;
+
+   fprintf(stderr, "emit %s/%d\n", state->name, state->cmd_size);
+
+   if (RADEON_DEBUG & DEBUG_VERBOSE) 
+      for (i = 0 ; i < state->cmd_size ; i++) 
+	 fprintf(stderr, "\t%s[%d]: %x\n", state->name, i, state->cmd[i]);
+
+}
+
 static void radeonSaveHwState( radeonContextPtr rmesa )
 {
    struct radeon_state_atom *atom;
    char * dest = rmesa->backup_store.cmd_buf;
 
+   if (RADEON_DEBUG & DEBUG_STATE)
+      fprintf(stderr, "%s\n", __FUNCTION__);
+   
    rmesa->backup_store.cmd_used = 0;
 
    foreach( atom, &rmesa->hw.atomlist ) {
@@ -75,10 +90,14 @@ static void radeonSaveHwState( radeonContextPtr rmesa )
 	 memcpy( dest, atom->cmd, size);
 	 dest += size;
 	 rmesa->backup_store.cmd_used += size;
+	 if (RADEON_DEBUG & DEBUG_STATE)
+	    print_state_atom( atom );
       }
    }
 
    assert( rmesa->backup_store.cmd_used <= RADEON_CMD_BUF_SZ );
+   if (RADEON_DEBUG & DEBUG_STATE)
+      fprintf(stderr, "Returning to radeonEmitState\n");
 }
 
 /* At this point we were in FlushCmdBufLocked but we had lost our context, so
@@ -88,7 +107,7 @@ static void radeonSaveHwState( radeonContextPtr rmesa )
  */
 static void radeonBackUpAndEmitLostStateLocked( radeonContextPtr rmesa )
 {
-   GLuint nr_released_bufs, saved_cmd_used;
+   GLuint nr_released_bufs;
    struct radeon_store saved_store;
 
    if (rmesa->backup_store.cmd_used == 0)
@@ -103,9 +122,7 @@ static void radeonBackUpAndEmitLostStateLocked( radeonContextPtr rmesa )
    saved_store = rmesa->store;
    rmesa->dma.nr_released_bufs = 0;
    rmesa->store = rmesa->backup_store;
-   saved_cmd_used = rmesa->backup_store.cmd_used;
    radeonFlushCmdBufLocked( rmesa, __FUNCTION__ );
-   rmesa->backup_store.cmd_used = saved_cmd_used;
    rmesa->dma.nr_released_bufs = nr_released_bufs;
    rmesa->store = saved_store;
 }
@@ -114,18 +131,6 @@ static void radeonBackUpAndEmitLostStateLocked( radeonContextPtr rmesa )
  * Kernel command buffer handling
  */
 
-static void print_state_atom( struct radeon_state_atom *state )
-{
-   int i;
-
-   fprintf(stderr, "emit %s/%d\n", state->name, state->cmd_size);
-
-   if (RADEON_DEBUG & DEBUG_VERBOSE) 
-      for (i = 0 ; i < state->cmd_size ; i++) 
-	 fprintf(stderr, "\t%s[%d]: %x\n", state->name, i, state->cmd[i]);
-
-}
-
 /* The state atoms will be emitted in the order they appear in the atom list,
  * so this step is important.
  */
@@ -1016,7 +1021,14 @@ static void radeonClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 	       __FUNCTION__, all, cx, cy, cw, ch );
    }
 
-   RADEON_FIREVERTICES( rmesa ); 
+   {
+      LOCK_HARDWARE( rmesa );
+      UNLOCK_HARDWARE( rmesa );
+      if ( dPriv->numClipRects == 0 ) 
+	 return;
+   }
+   
+   radeonFlush( ctx ); 
 
    if ( mask & DD_FRONT_LEFT_BIT ) {
       flags |= RADEON_FRONT;
diff --git a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c
index a3b2047bc..38bc4ebbc 100644
--- a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -87,11 +87,14 @@ static const GLuint __driNConfigOptions = 10;
 #define PCI_CHIP_RADEON_QZ	0x515A
 
 #define PCI_CHIP_RADEON_LW	0x4C57 /* mobility 7 - has tcl */
+#define PCI_CHIP_RADEON_LX	0x4C58 /* mobility FireGL 7800 m7 */
 
 #define PCI_CHIP_RADEON_LY	0x4C59
 #define PCI_CHIP_RADEON_LZ	0x4C5A
 
 #define PCI_CHIP_RV200_QW	0x5157 /* Radeon 7500 - not an R200 at all */
+#define PCI_CHIP_RV200_QX	0x5158
+
 /* IGP Chipsets */
 #define PCI_CHIP_RS100_4136     0x4136
 #define PCI_CHIP_RS200_4137     0x4137
@@ -309,7 +312,9 @@ radeonScreenPtr radeonCreateScreen( __DRIscreenPrivate *sPriv )
    case PCI_CHIP_RADEON_QF:
    case PCI_CHIP_RADEON_QG:
    case PCI_CHIP_RV200_QW:
+   case PCI_CHIP_RV200_QX:
    case PCI_CHIP_RADEON_LW:
+   case PCI_CHIP_RADEON_LX:
       screen->chipset |= RADEON_CHIPSET_TCL;
    case PCI_CHIP_RADEON_QY:
    case PCI_CHIP_RADEON_QZ:
diff --git a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
index e86204419..35720fd65 100644
--- a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
@@ -564,9 +564,12 @@ static void *radeon_alloc_elts( radeonContextPtr rmesa, int nr )
 #define EMIT_ELT(offset, x) do {				\
 	int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 );	\
 	GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 );	\
-	(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); } while (0)
+	(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); 	\
+	(void)rmesa; } while (0)
 #else
-#define EMIT_ELT(offset, x) (dest)[offset] = (GLushort) (x)
+#define EMIT_ELT(offset, x) do {				\
+	(dest)[offset] = (GLushort) (x);			\
+	(void)rmesa; } while (0)
 #endif
 #define EMIT_TWO_ELTS(offset, x, y)  *(GLuint *)(dest+offset) = ((y)<<16)|(x);
 #define INCR_ELTS( nr ) dest += nr
diff --git a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
index 6c121974e..760c9a034 100644
--- a/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
@@ -169,7 +169,7 @@ static GLushort *radeonAllocElts( radeonContextPtr rmesa, GLuint nr )
  * discrete and there are no intervening state changes.  (Somewhat
  * duplicates changes to DrawArrays code)
  */
-static void EMIT_PRIM( GLcontext *ctx, 
+static void radeonEmitPrim( GLcontext *ctx, 
 		       GLenum prim, 
 		       GLuint hwprim, 
 		       GLuint start, 
@@ -194,7 +194,9 @@ static void EMIT_PRIM( GLcontext *ctx,
 		       count - start );
 }
 
-
+#define EMIT_PRIM( ctx, prim, hwprim, start, count ) do {       \
+   radeonEmitPrim( ctx, prim, hwprim, start, count );           \
+   (void) rmesa; } while (0)
 
 /* Try & join small primitives
  */
@@ -214,9 +216,12 @@ static void EMIT_PRIM( GLcontext *ctx,
 #define EMIT_ELT(dest, offset, x) do {				\
 	int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 );	\
 	GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 );	\
-	(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); } while (0)
+	(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); 	\
+	(void)rmesa; } while (0)
 #else
-#define EMIT_ELT(dest, offset, x) (dest)[offset] = (GLushort) (x)
+#define EMIT_ELT(dest, offset, x) do {				\
+	(dest)[offset] = (GLushort) (x);			\
+	(void)rmesa; } while (0)
 #endif
 
 #define EMIT_TWO_ELTS(dest, offset, x, y)  *(GLuint *)(dest+offset) = ((y)<<16)|(x);
diff --git a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.c b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.c
index 4ebf393ac..a994ee7e3 100644
--- a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.c
@@ -136,6 +136,110 @@ static const GLubyte *viaGetString(GLcontext *ctx, GLenum name)
    }
 }
 
+
+/**
+ * Calculate a width that satisfies the hardware's alignment requirements.
+ * On the Unichrome hardware, each scanline must be aligned to a multiple of
+ * 16 pixels.
+ *
+ * \param width  Minimum buffer width, in pixels.
+ * 
+ * \returns A pixel width that meets the alignment requirements.
+ */
+static __inline__ unsigned
+buffer_align( unsigned width )
+{
+    return (width + 0x0f) & ~0x0f;
+}
+
+
+/**
+ * Calculate the framebuffer parameters for all buffers (front, back, depth,
+ * and stencil) associated with the specified context.
+ * 
+ * \warning
+ * This function also calls \c AllocateBuffer to actually allocate the
+ * buffers.
+ * 
+ * \sa AllocateBuffer
+ */
+static GLboolean
+calculate_buffer_parameters( viaContextPtr vmesa )
+{
+    const unsigned shift = vmesa->viaScreen->bitsPerPixel / 16;
+    const unsigned extra = (vmesa->drawType == GLX_PBUFFER_BIT) ? 0 : 32;
+    unsigned w;
+    unsigned h;
+
+    if (vmesa->drawType == GLX_PBUFFER_BIT) {
+	w = vmesa->driDrawable->w;
+	h = vmesa->driDrawable->h;
+    }
+    else { 
+	w = vmesa->viaScreen->width;
+	h = vmesa->viaScreen->height;
+
+	vmesa->front.offset = 0;
+	vmesa->front.map = (char *) vmesa->driScreen->pFB;
+    }
+
+    vmesa->front.pitch = buffer_align( w ) << shift;
+    vmesa->front.size = vmesa->front.pitch * h;
+
+
+    /* Allocate back-buffer */
+
+    vmesa->back.pitch = (buffer_align( vmesa->driDrawable->w ) << shift) 
+      + extra;
+    vmesa->back.size = vmesa->back.pitch * vmesa->driDrawable->h;
+
+#ifdef DEBUG
+    if (VIA_DEBUG) fprintf(stderr, "viaMakeCurrent backbuffer: w = %d h = %d bpp = %d sizs = %d\n",
+			   vmesa->back.pitch, 
+			   vmesa->driDrawable->h,
+			   8 << shift,
+			   vmesa->back.size);
+#endif
+
+    /* Allocate depth-buffer */
+    if ( vmesa->hasStencil || vmesa->hasDepth ) {
+	const unsigned dShift = (vmesa->hasStencil)
+	  ? 2 : (vmesa->depthBits / 16);
+
+	vmesa->depth.pitch = (buffer_align( vmesa->driDrawable->w ) << dShift)
+	  + extra;
+	vmesa->depth.bpp = 8 << dShift;
+	vmesa->depth.size = vmesa->depth.pitch * vmesa->driDrawable->h;
+    }
+    else {
+	(void) memset( & vmesa->depth, 0, sizeof( vmesa->depth ) );
+    }
+
+#ifdef DEBUG
+    if (VIA_DEBUG) fprintf(stderr, "viaMakeCurrent depthbuffer: w = %d h = %d bpp = %d sizs = %d\n", 
+			   vmesa->depth.pitch,
+			   vmesa->driDrawable->h,
+			   vmesa->depth.bpp,
+			   vmesa->depth.size);
+#endif
+
+    /*=* John Sheng [2003.5.31] flip *=*/
+    if( (vmesa->viaScreen->width == vmesa->driDrawable->w)
+	&& (vmesa->viaScreen->height == vmesa->driDrawable->h) ) {
+	vmesa->doPageFlip = GL_FALSE;
+	vmesa->currentPage = 0;
+	vmesa->back.pitch = vmesa->front.pitch;
+    }
+
+    if (!AllocateBuffer(vmesa)) {
+	FREE(vmesa);
+	return GL_FALSE;
+    }
+    
+    return GL_TRUE;
+}
+
+
 void viaReAllocateBuffers(GLframebuffer *drawbuffer)
 {
     GLcontext *ctx;
@@ -152,95 +256,11 @@ void viaReAllocateBuffers(GLframebuffer *drawbuffer)
      
     vmesa->driDrawable->w = ctx->DrawBuffer->Width;
     vmesa->driDrawable->h = ctx->DrawBuffer->Height;
+
     LOCK_HARDWARE(vmesa);
-    
-    /* Allocate back & depth buffer */
-    {
-	int w, h, bpp;	    
-	w = vmesa->driDrawable->w;
-	h = vmesa->driDrawable->h;
-	/* back buffer */
-	bpp = vmesa->viaScreen->bitsPerPixel;
-#ifdef DEBUG	    
-	if (VIA_DEBUG) fprintf(stderr, "driScreen->fbBPP = %d\n", bpp);	    
-#endif	    
-	if (bpp == 32) {
-	    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-	    vmesa->back.size = w * h * bpp / 8;
-	    vmesa->back.pitch = w << 2;
-	}
-	else {
-	    w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2 + 16;
-	    vmesa->back.size = w * h * bpp / 8;
-	    vmesa->back.pitch = w << 1;	       
-	}
-#ifdef DEBUG
-	if (VIA_DEBUG) fprintf(stderr, "resizebuffer backbuffer: w = %d h = %d bpp = %d sizs = %d\n", 
-			    w, h, bpp, vmesa->back.size);
-#endif
-	/* depth buffer */
-	w = vmesa->driDrawable->w;
-	if (vmesa->hasDepth && vmesa->hasStencil) {
-	    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-	    vmesa->depth.size = w * h * 4;
-	    vmesa->depth.pitch = w << 2;
-	    vmesa->depth.bpp = 32;
-#ifdef DEBUG
-	    if (VIA_DEBUG) fprintf(stderr, "depthBits = 24\n");
-	    if (VIA_DEBUG) fprintf(stderr, "StencilBits = 8\n");
-#endif
-	}
-	else if (vmesa->hasDepth) {
-	    /*=* John Sheng [2003.6.16] patch viewperf drv-08 draw nothing */
-	    /*if(vmesa->viaScreen->bitsPerPixel == 32)*/
-		/*vmesa->depthBits = 16;*/
-		
-	    if (vmesa->depthBits == 16) {
-		w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2 + 16;
-		vmesa->depth.size = w * h * 2;	       
-		vmesa->depth.pitch = w << 1;
-		vmesa->depth.bpp = 16;
-#ifdef DEBUG
-		if (VIA_DEBUG) fprintf(stderr, "depthBits = 16\n");
-#endif
-	    }
-	    else {
-		w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-		vmesa->depth.size = w * h * 4;
-		vmesa->depth.pitch = w << 2;
-		vmesa->depth.bpp = 32;
-#ifdef DEBUG
-		if (VIA_DEBUG) fprintf(stderr, "depthBits = 32\n");
-#endif
-	    }
-	}
-	else if (vmesa->hasStencil) {
-	    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-	    vmesa->depth.size = w * h * 4;
-	    vmesa->depth.pitch = w << 2;
-	    vmesa->depth.bpp = 32;
-#ifdef DEBUG		
-	    if (VIA_DEBUG) fprintf(stderr, "StencilBits = 8\n");
-#endif
-	}
-#ifdef DEBUG
-	if (VIA_DEBUG) fprintf(stderr, "resizebuffer depthbuffer: w = %d h = %d bpp = %d sizs = %d\n", 
-			            w, h, vmesa->depth.bpp, vmesa->depth.size);
-#endif	
-	/*=* John Sheng [2003.5.31] flip *=*/
-	{
-	    if(vmesa->viaScreen->width == vmesa->driDrawable->w &&
-    		vmesa->viaScreen->height == vmesa->driDrawable->h) {
-		vmesa->back.pitch = vmesa->front.pitch;
-		vmesa->back.size = vmesa->front.size;
-	    }
-	}
-    
-	if (!AllocateBuffer(vmesa)) {
-    	    FREE(vmesa);
-	}
-    }
+    calculate_buffer_parameters( vmesa );
     UNLOCK_HARDWARE(vmesa);
+
 #ifdef DEBUG
     if (VIA_DEBUG) fprintf(stderr, "%s - out\n", __FUNCTION__);
 #endif
@@ -440,6 +460,8 @@ viaCreateContext(const __GLcontextModes *mesaVis,
     ctx->Const.MaxTextureLevels = 11;
     
     ctx->Const.MaxTextureUnits = 2;
+    ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits;
+    ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits;
 
     ctx->Const.MinLineWidth = 1.0;
     ctx->Const.MinLineWidthAA = 1.0;
@@ -567,12 +589,12 @@ viaCreateContext(const __GLcontextModes *mesaVis,
     if (VIA_DEBUG) fprintf(stderr, "%s - out\n", __FUNCTION__);    
 #endif
     {
-	GLboolean saam;
-	int count = 0, fbSize;
 #ifndef USE_XINERAMA
         vmesa->saam = 0;
 #else
-	saam = XineramaIsActive(vmesa->display);
+	GLboolean saam = XineramaIsActive(vmesa->display);
+	int count = 0, fbSize;
+
 	if (saam && vmesa->viaScreen->drixinerama) {
 	    vmesa->xsi = XineramaQueryScreens(vmesa->display, &count);
 	    /* Test RightOf or Down */
@@ -716,8 +738,10 @@ void viaXMesaSetBackClipRects(viaContextPtr vmesa)
 void viaXMesaWindowMoved(viaContextPtr vmesa)
 {
     GLuint bytePerPixel = vmesa->viaScreen->bitsPerPixel >> 3;
+#ifdef USE_XINERAMA
     GLuint side = 0;
     __DRIdrawablePrivate *dPriv = vmesa->driDrawable;
+#endif
     
     switch (vmesa->glCtx->Color._DrawDestMask) {
     case __GL_FRONT_BUFFER_MASK: 
@@ -904,178 +928,22 @@ viaMakeCurrent(__DRIcontextPrivate *driContextPriv,
 	fprintf(stderr, "driContextPriv = %08x\n", (GLuint)driReadPriv);
     }	
 #endif    
-    
+
     if (driContextPriv) {
         viaContextPtr vmesa = (viaContextPtr)driContextPriv->driverPrivate;
+
 	current_mesa = vmesa;
-	
-	vmesa->driDrawable = driDrawPriv;
-	if (vmesa->drawType == GLX_PBUFFER_BIT) {
-	    int w, h, bpp;
-	    
-	    w = vmesa->driDrawable->w;
-	    h = vmesa->driDrawable->h;
-	    bpp = vmesa->viaScreen->bitsPerPixel;
-	    if (bpp == 32) {
-		w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4;
-		vmesa->front.size = w * h * bpp / 8;
-		vmesa->front.pitch = w << 2;
-	    }
-	    else {
-		w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2;
-		vmesa->front.size = w * h * bpp / 8;
-		vmesa->front.pitch = w << 1;	       
-	    }	
-	}
-	/*=* John Sheng [2003.6.20] fix resolution 720x480/720x576 front pitch error *=*/
-	else { 
-	    GLuint w;
-	    GLuint h;
-	    GLuint bpp;
-	    bpp = vmesa->viaScreen->bitsPerPixel;
-	    h = vmesa->viaScreen->height;
-	    w = vmesa->viaScreen->width;
-	    if (bpp == 0x20) {
-		w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4;
-		vmesa->front.size = w * h * bpp / 8;
-		vmesa->front.pitch = w << 2;
-#ifdef DEBUG
-		if (VIA_DEBUG) fprintf(stderr, "viaScreen->bitsPerPixel = %d\n", 32);	    
-#endif
-	    } 
-	    else if (bpp == 0x10) {
-		w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2;
-		vmesa->front.size = w * h * bpp / 8;
-		vmesa->front.pitch = w << 1;	       
-#ifdef DEBUG
-		if (VIA_DEBUG) fprintf(stderr, "viaScreen->bitsPerPixel = %d\n", 16);	    
-#endif
-	    }
-	    vmesa->front.offset = 0;
-	    vmesa->front.map = (char *) vmesa->driScreen->pFB;
-	    vmesa->front.size = w * h * vmesa->viaScreen->bitsPerPixel /8;
-	}
-	
-	/* Allocate back & depth buffer */
-	{
-	    int w, h, bpp;
-	    
-	    w = vmesa->driDrawable->w;
-#ifdef DEBUG
-	    if (VIA_DEBUG) fprintf(stderr, "viaMakeCurrent: w = %d\n", w);	    
-#endif	    
-	    h = vmesa->driDrawable->h;
-	    
-	    /* back buffer */
-	    bpp = vmesa->viaScreen->bitsPerPixel;
-#ifdef DEBUG	    
-	    if (VIA_DEBUG) fprintf(stderr, "driScreen->fbBPP = %d\n", bpp);	    
-#endif	    
-	    if (bpp == 32) {
-		if (vmesa->drawType == GLX_PBUFFER_BIT)
-		    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4;
-		else
-		    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-		
-		vmesa->back.size = w * h * bpp / 8;
-		vmesa->back.pitch = w << 2;
-	    }
-	    else {
-		if (vmesa->drawType == GLX_PBUFFER_BIT)
-		    w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2;
-		else
-		    w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2 + 16;
-		
-		vmesa->back.size = w * h * bpp / 8;
-		vmesa->back.pitch = w << 1;	       
-	    }
-#ifdef DEBUG
-	    if (VIA_DEBUG) fprintf(stderr, "viaMakeCurrent backbuffer: w = %d h = %d bpp = %d sizs = %d\n", 
-				    w, h, bpp, vmesa->back.size);
-#endif
-	    /* depth buffer */
-	    w = vmesa->driDrawable->w;
-
-	    if (vmesa->hasDepth && vmesa->hasStencil) {
-		if (vmesa->drawType == GLX_PBUFFER_BIT)
-		    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4;
-		else
-		    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-
-		vmesa->depth.size = w * h * 4;
-		vmesa->depth.pitch = w << 2;
-		vmesa->depth.bpp = 32;
-#ifdef DEBUG
-		if (VIA_DEBUG) fprintf(stderr, "depthBits = 24\n");
-		if (VIA_DEBUG) fprintf(stderr, "StencilBits = 8\n");
-#endif
-	    }
-	    else if (vmesa->hasDepth) {
 
-		/*=* John Sheng [2003.6.16] patch viewperf drv-08 draw nothing */
-		/*if(vmesa->viaScreen->bitsPerPixel == 32)*/
-		    /*vmesa->depthBits = 16;*/
-		    
-		if (vmesa->depthBits == 16) {
-		    if (vmesa->drawType == GLX_PBUFFER_BIT)
-			w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2;
-		    else
-			w = BUFFER_ALIGN_WIDTH(w * 2, BUFFER_ALIGNMENT) / 2 + 16;
-
-		    vmesa->depth.size = w * h * 2;	       
-		    vmesa->depth.pitch = w << 1;
-		    vmesa->depth.bpp = 16;
-#ifdef DEBUG
-		    if (VIA_DEBUG) fprintf(stderr, "depthBits = 16\n");
-#endif
-		}
-		else {
-		    if (vmesa->drawType == GLX_PBUFFER_BIT)
-			w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4;
-		    else
-			w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-
-		    vmesa->depth.size = w * h * 4;
-		    vmesa->depth.pitch = w << 2;
-		    vmesa->depth.bpp = 32;
 #ifdef DEBUG
-		    if (VIA_DEBUG) fprintf(stderr, "depthBits = 32\n");
-#endif
-		}
-	    }
-	    else if (vmesa->hasStencil) {
-		if (vmesa->drawType == GLX_PBUFFER_BIT)
-		    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4;
-		else
-		    w = BUFFER_ALIGN_WIDTH(w * 4, BUFFER_ALIGNMENT) / 4 + 8;
-
-		vmesa->depth.size = w * h * 4;
-		vmesa->depth.pitch = w << 2;
-		vmesa->depth.bpp = 32;
-#ifdef DEBUG		
-		if (VIA_DEBUG) fprintf(stderr, "StencilBits = 8\n");
+	if (VIA_DEBUG) fprintf(stderr, "viaScreen->bitsPerPixel = %d\n", viaScreen->bitsPerPixel);
+	if (VIA_DEBUG) fprintf(stderr, "viaMakeCurrent: w = %d\n", vmesa->driDrawable->w);
 #endif
-	    }
-#ifdef DEBUG
-	    if (VIA_DEBUG) fprintf(stderr, "viaMakeCurrent depthbuffer: w = %d h = %d bpp = %d sizs = %d\n", 
-			           w, h, vmesa->depth.bpp, vmesa->depth.size);
-#endif	    
-	    /*=* John Sheng [2003.5.31] flip *=*/
-	    {
-		viaContextPtr vmesa = (viaContextPtr)driContextPriv->driverPrivate;	
-		if(vmesa->viaScreen->width == vmesa->driDrawable->w &&
-    		    vmesa->viaScreen->height == vmesa->driDrawable->h) {
-		    vmesa->doPageFlip = GL_FALSE;
-		    vmesa->currentPage = 0;
-		    vmesa->back.pitch = vmesa->front.pitch;
-		}
-	    }
 
-	    if (!AllocateBuffer(vmesa)) {
-    		FREE(vmesa);
-    		return GL_FALSE;
-	    }
+	vmesa->driDrawable = driDrawPriv;
+	if ( ! calculate_buffer_parameters( vmesa ) ) {
+	    return GL_FALSE;
 	}
+
         _mesa_make_current2(vmesa->glCtx,
                             (GLframebuffer *)driDrawPriv->driverPrivate,
                             (GLframebuffer *)driReadPriv->driverPrivate);
diff --git a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.h b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.h
index 5efd9a022..5b2855a83 100644
--- a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.h
+++ b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_context.h
@@ -75,10 +75,7 @@ typedef struct via_texture_object_t *viaTextureObjectPtr;
 #define TAG(x) via##x
 #include "tnl_dd/t_dd_vertex.h"
 #undef TAG
-#define BUFFER_ALIGNMENT 32
-#define BUFFER_ALIGN_WIDTH1(w, a)   (((w) + ((a) - 1)) & ~((a) - 1))
-#define BUFFER_ALIGN_WIDTH(w, a)    (((w) & ((a) - 1)) ? BUFFER_ALIGN_WIDTH1(w, a) : (w))
-#define BUFFER_ALIGN_ADDRESS(p, a)  ((GLvoid *)(((GLint)(p)) + ((a)-1) & ~((a)-1)))
+
 #define RightOf 1
 #define LeftOf 2
 #define Down 4
diff --git a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c
index eaa5a726e..9f2ce638a 100644
--- a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c
+++ b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c
@@ -313,7 +313,6 @@ void viaCopyBuffer(const __DRIdrawablePrivate *dPriv)
 #ifdef DEBUG    
         if (VIA_DEBUG) fprintf(stderr, "%s SwapPBuffers\n", __FUNCTION__);    
 #endif	/*=* [DBG] for pbuffer *=*/
-	/*viaDoSwapBufferSoftFront(vmesa);*/
     }
     else {
 	GLuint scrn = 0;
@@ -1436,83 +1435,7 @@ void viaDoSwapPBuffers(viaContextPtr vmesa)
 #endif
 }
 
-void viaDoSwapBufferSoft(viaContextPtr vmesa)
-{    
-    GLuint nFrontPitch;
-    GLuint nBackPitch;
-    GLuint nFrontBase, nBackBase;
-    GLuint i, j;
-    GLubyte *by, *fy;
-    GLuint w;
-    
-    w = vmesa->viaScreen->width;
-    w = BUFFER_ALIGN_WIDTH(w, BUFFER_ALIGNMENT);
-    
-    if (vmesa->viaScreen->bitsPerPixel == 0x20)
-	nFrontPitch = w << 2;
-    else
-	nFrontPitch = w << 1;
-    
-    nBackPitch = vmesa->back.pitch;
-    
-    /* Caculate Base */
-    nFrontBase = (GLuint) vmesa->driScreen->pFB;
-    nBackBase = ((GLuint) vmesa->back.offset) + ((GLuint) vmesa->driScreen->pFB);
-    by = (GLubyte *) nBackBase;
-    fy = (GLubyte *) nFrontBase;
-    
-    viaFlushPrimsLocked(vmesa);
-    
-    for (i = 0; i < vmesa->driDrawable->h; i++) {
-	fy = (GLubyte *)(nFrontBase + i * nFrontPitch);
-	for (j = 0; j < nBackPitch; j++) {
-	    *((GLubyte*)fy) = *((GLubyte*)by);
-	    fy = fy + 1;
-	    by = by + 1;
-	}
-	
-    }
-
-}
 
-void viaDoSwapBufferSoftFront(viaContextPtr vmesa)
-{    
-    GLuint nFrontPitch;
-    GLuint nBackPitch;
-    GLuint nFrontBase, nBackBase;
-    GLuint i, j;
-    GLubyte *by, *fy;
-    GLuint w;
-    
-    w = vmesa->viaScreen->width;
-    w = BUFFER_ALIGN_WIDTH(w, BUFFER_ALIGNMENT);
-    
-    if (vmesa->viaScreen->bitsPerPixel == 0x20)
-	nFrontPitch = w << 2;
-    else
-	nFrontPitch = w << 1;
-	
-    nBackPitch = vmesa->front.pitch;
-    
-    /* Caculate Base */
-    nFrontBase = (GLuint) vmesa->driScreen->pFB;
-    nBackBase = ((GLuint) vmesa->front.offset) + ((GLuint) vmesa->driScreen->pFB);
-    by = (GLubyte *) nBackBase;
-    fy = (GLubyte *) nFrontBase;
-    
-    viaFlushPrimsLocked(vmesa);
-    
-    for (i = 0; i < vmesa->driDrawable->h; i++) {
-	fy = (GLubyte *)(nFrontBase + i * nFrontPitch);
-	for (j = 0; j < nBackPitch; j++) {
-	    *((GLubyte*)fy) = *((GLubyte*)by);
-	    fy = fy + 1;
-	    by = by + 1;
-	}
-	
-    }
-
-}
 int flush_agp(viaContextPtr vmesa, drm_via_flush_agp_t* agpCmd) 
 {   
     GLuint *pnAGPCurrentPhysStart;
diff --git a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.h b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.h
index e9030e630..3bdd6c359 100644
--- a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.h
+++ b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_ioctl.h
@@ -47,8 +47,6 @@ void viaFillStencilBuffer(viaContextPtr vmesa, GLuint pixel);
 void viaFillStencilDepthBuffer(viaContextPtr vmesa, GLuint pixel);
 void viaDoSwapBuffers(viaContextPtr vmesa);
 void viaDoSwapBuffersSaam(viaContextPtr vmesa);
-void viaDoSwapBufferSoft(viaContextPtr vmesa);
-void viaDoSwapBufferSoftFront(viaContextPtr vmesa);
 void viaDoSwapPBuffers(viaContextPtr vmesa);
 
 int flush_agp(viaContextPtr vmesa, drm_via_flush_agp_t* agpCmd); 
diff --git a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_texcombine.c b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_texcombine.c
index 9559cb30c..bdd3018e3 100644
--- a/extras/Mesa/src/mesa/drivers/dri/unichrome/via_texcombine.c
+++ b/extras/Mesa/src/mesa/drivers/dri/unichrome/via_texcombine.c
@@ -20,9 +20,13 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file via_texcombine.c
+ * Calculate texture combine hardware state.
  *
- * Authors:
- *    Ian Romanick <idr@us.ibm.com>
+ * \author Ian Romanick <idr@us.ibm.com>
  */
 
 #include <stdio.h>
@@ -106,8 +110,8 @@ viaTexCombineState( viaContextPtr vmesa,
    unsigned alpha = 0;
    unsigned bias = 0;
    unsigned op = 0;
-   unsigned a_shift = combine->ScaleShiftRGB;
-   unsigned c_shift = combine->ScaleShiftA;
+   unsigned a_shift = combine->ScaleShiftA;
+   unsigned c_shift = combine->ScaleShiftRGB;
    unsigned i;
    unsigned constant_color[3];
    unsigned ordered_constant_color[4];
diff --git a/extras/Mesa/src/mesa/drivers/osmesa/osmesa.c b/extras/Mesa/src/mesa/drivers/osmesa/osmesa.c
index 7932b90f5..366bb03df 100644
--- a/extras/Mesa/src/mesa/drivers/osmesa/osmesa.c
+++ b/extras/Mesa/src/mesa/drivers/osmesa/osmesa.c
@@ -1273,23 +1273,25 @@ OSMesaGetColorBuffer( OSMesaContext c, GLint *width,
 }
 
 
+typedef void (*OSMESAproc)(void);
 
-struct name_address {
+struct name_function
+{
    const char *Name;
-   GLvoid *Address;
+   OSMESAproc Function;
 };
 
-static struct name_address functions[] = {
-   { "OSMesaCreateContext", (void *) OSMesaCreateContext },
-   { "OSMesaCreateContextExt", (void *) OSMesaCreateContextExt },
-   { "OSMesaDestroyContext", (void *) OSMesaDestroyContext },
-   { "OSMesaMakeCurrent", (void *) OSMesaMakeCurrent },
-   { "OSMesaGetCurrentContext", (void *) OSMesaGetCurrentContext },
-   { "OSMesaPixelsStore", (void *) OSMesaPixelStore },
-   { "OSMesaGetIntegerv", (void *) OSMesaGetIntegerv },
-   { "OSMesaGetDepthBuffer", (void *) OSMesaGetDepthBuffer },
-   { "OSMesaGetColorBuffer", (void *) OSMesaGetColorBuffer },
-   { "OSMesaGetProcAddress", (void *) OSMesaGetProcAddress },
+static struct name_function functions[] = {
+   { "OSMesaCreateContext", (OSMESAproc) OSMesaCreateContext },
+   { "OSMesaCreateContextExt", (OSMESAproc) OSMesaCreateContextExt },
+   { "OSMesaDestroyContext", (OSMESAproc) OSMesaDestroyContext },
+   { "OSMesaMakeCurrent", (OSMESAproc) OSMesaMakeCurrent },
+   { "OSMesaGetCurrentContext", (OSMESAproc) OSMesaGetCurrentContext },
+   { "OSMesaPixelsStore", (OSMESAproc) OSMesaPixelStore },
+   { "OSMesaGetIntegerv", (OSMESAproc) OSMesaGetIntegerv },
+   { "OSMesaGetDepthBuffer", (OSMESAproc) OSMesaGetDepthBuffer },
+   { "OSMesaGetColorBuffer", (OSMESAproc) OSMesaGetColorBuffer },
+   { "OSMesaGetProcAddress", (OSMESAproc) OSMesaGetProcAddress },
    { NULL, NULL }
 };
 
@@ -1299,7 +1301,7 @@ OSMesaGetProcAddress( const char *funcName )
    int i;
    for (i = 0; functions[i].Name; i++) {
       if (_mesa_strcmp(functions[i].Name, funcName) == 0)
-         return (void *) functions[i].Address;
+         return (void *) functions[i].Function;
    }
    return (void *) _glapi_get_proc_address(funcName);
 }
diff --git a/extras/Mesa/src/mesa/drivers/x11/glxapi.c b/extras/Mesa/src/mesa/drivers/x11/glxapi.c
index 468099431..99fc4e27e 100644
--- a/extras/Mesa/src/mesa/drivers/x11/glxapi.c
+++ b/extras/Mesa/src/mesa/drivers/x11/glxapi.c
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.2.1
  * 
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1141,160 +1140,161 @@ generic_no_op_func(void)
 void
 _glxapi_set_no_op_table(struct _glxapi_table *t)
 {
+   typedef int (*nop_func)(void);
+   nop_func *dispatch = (nop_func *) t;
    GLuint n = _glxapi_get_dispatch_table_size();
    GLuint i;
-   void **dispatch = (void **) t;
    for (i = 0; i < n; i++) {
-      dispatch[i] = (void *) generic_no_op_func;
+      dispatch[i] = generic_no_op_func;
    }
 }
 
 
 struct name_address_pair {
    const char *Name;
-   GLvoid *Address;
+   __GLXextFuncPtr Address;
 };
 
 static struct name_address_pair GLX_functions[] = {
    /*** GLX_VERSION_1_0 ***/
-   { "glXChooseVisual", (GLvoid *) glXChooseVisual },
-   { "glXCopyContext", (GLvoid *) glXCopyContext },
-   { "glXCreateContext", (GLvoid *) glXCreateContext },
-   { "glXCreateGLXPixmap", (GLvoid *) glXCreateGLXPixmap },
-   { "glXDestroyContext", (GLvoid *) glXDestroyContext },
-   { "glXDestroyGLXPixmap", (GLvoid *) glXDestroyGLXPixmap },
-   { "glXGetConfig", (GLvoid *) glXGetConfig },
-   { "glXGetCurrentContext", (GLvoid *) glXGetCurrentContext },
-   { "glXGetCurrentDrawable", (GLvoid *) glXGetCurrentDrawable },
-   { "glXIsDirect", (GLvoid *) glXIsDirect },
-   { "glXMakeCurrent", (GLvoid *) glXMakeCurrent },
-   { "glXQueryExtension", (GLvoid *) glXQueryExtension },
-   { "glXQueryVersion", (GLvoid *) glXQueryVersion },
-   { "glXSwapBuffers", (GLvoid *) glXSwapBuffers },
-   { "glXUseXFont", (GLvoid *) glXUseXFont },
-   { "glXWaitGL", (GLvoid *) glXWaitGL },
-   { "glXWaitX", (GLvoid *) glXWaitX },
+   { "glXChooseVisual", (__GLXextFuncPtr) glXChooseVisual },
+   { "glXCopyContext", (__GLXextFuncPtr) glXCopyContext },
+   { "glXCreateContext", (__GLXextFuncPtr) glXCreateContext },
+   { "glXCreateGLXPixmap", (__GLXextFuncPtr) glXCreateGLXPixmap },
+   { "glXDestroyContext", (__GLXextFuncPtr) glXDestroyContext },
+   { "glXDestroyGLXPixmap", (__GLXextFuncPtr) glXDestroyGLXPixmap },
+   { "glXGetConfig", (__GLXextFuncPtr) glXGetConfig },
+   { "glXGetCurrentContext", (__GLXextFuncPtr) glXGetCurrentContext },
+   { "glXGetCurrentDrawable", (__GLXextFuncPtr) glXGetCurrentDrawable },
+   { "glXIsDirect", (__GLXextFuncPtr) glXIsDirect },
+   { "glXMakeCurrent", (__GLXextFuncPtr) glXMakeCurrent },
+   { "glXQueryExtension", (__GLXextFuncPtr) glXQueryExtension },
+   { "glXQueryVersion", (__GLXextFuncPtr) glXQueryVersion },
+   { "glXSwapBuffers", (__GLXextFuncPtr) glXSwapBuffers },
+   { "glXUseXFont", (__GLXextFuncPtr) glXUseXFont },
+   { "glXWaitGL", (__GLXextFuncPtr) glXWaitGL },
+   { "glXWaitX", (__GLXextFuncPtr) glXWaitX },
 
    /*** GLX_VERSION_1_1 ***/
-   { "glXGetClientString", (GLvoid *) glXGetClientString },
-   { "glXQueryExtensionsString", (GLvoid *) glXQueryExtensionsString },
-   { "glXQueryServerString", (GLvoid *) glXQueryServerString },
+   { "glXGetClientString", (__GLXextFuncPtr) glXGetClientString },
+   { "glXQueryExtensionsString", (__GLXextFuncPtr) glXQueryExtensionsString },
+   { "glXQueryServerString", (__GLXextFuncPtr) glXQueryServerString },
 
    /*** GLX_VERSION_1_2 ***/
-   { "glXGetCurrentDisplay", (GLvoid *) glXGetCurrentDisplay },
+   { "glXGetCurrentDisplay", (__GLXextFuncPtr) glXGetCurrentDisplay },
 
    /*** GLX_VERSION_1_3 ***/
-   { "glXChooseFBConfig", (GLvoid *) glXChooseFBConfig },
-   { "glXCreateNewContext", (GLvoid *) glXCreateNewContext },
-   { "glXCreatePbuffer", (GLvoid *) glXCreatePbuffer },
-   { "glXCreatePixmap", (GLvoid *) glXCreatePixmap },
-   { "glXCreateWindow", (GLvoid *) glXCreateWindow },
-   { "glXDestroyPbuffer", (GLvoid *) glXDestroyPbuffer },
-   { "glXDestroyPixmap", (GLvoid *) glXDestroyPixmap },
-   { "glXDestroyWindow", (GLvoid *) glXDestroyWindow },
-   { "glXGetCurrentReadDrawable", (GLvoid *) glXGetCurrentReadDrawable },
-   { "glXGetFBConfigAttrib", (GLvoid *) glXGetFBConfigAttrib },
-   { "glXGetFBConfigs", (GLvoid *) glXGetFBConfigs },
-   { "glXGetSelectedEvent", (GLvoid *) glXGetSelectedEvent },
-   { "glXGetVisualFromFBConfig", (GLvoid *) glXGetVisualFromFBConfig },
-   { "glXMakeContextCurrent", (GLvoid *) glXMakeContextCurrent },
-   { "glXQueryContext", (GLvoid *) glXQueryContext },
-   { "glXQueryDrawable", (GLvoid *) glXQueryDrawable },
-   { "glXSelectEvent", (GLvoid *) glXSelectEvent },
+   { "glXChooseFBConfig", (__GLXextFuncPtr) glXChooseFBConfig },
+   { "glXCreateNewContext", (__GLXextFuncPtr) glXCreateNewContext },
+   { "glXCreatePbuffer", (__GLXextFuncPtr) glXCreatePbuffer },
+   { "glXCreatePixmap", (__GLXextFuncPtr) glXCreatePixmap },
+   { "glXCreateWindow", (__GLXextFuncPtr) glXCreateWindow },
+   { "glXDestroyPbuffer", (__GLXextFuncPtr) glXDestroyPbuffer },
+   { "glXDestroyPixmap", (__GLXextFuncPtr) glXDestroyPixmap },
+   { "glXDestroyWindow", (__GLXextFuncPtr) glXDestroyWindow },
+   { "glXGetCurrentReadDrawable", (__GLXextFuncPtr) glXGetCurrentReadDrawable },
+   { "glXGetFBConfigAttrib", (__GLXextFuncPtr) glXGetFBConfigAttrib },
+   { "glXGetFBConfigs", (__GLXextFuncPtr) glXGetFBConfigs },
+   { "glXGetSelectedEvent", (__GLXextFuncPtr) glXGetSelectedEvent },
+   { "glXGetVisualFromFBConfig", (__GLXextFuncPtr) glXGetVisualFromFBConfig },
+   { "glXMakeContextCurrent", (__GLXextFuncPtr) glXMakeContextCurrent },
+   { "glXQueryContext", (__GLXextFuncPtr) glXQueryContext },
+   { "glXQueryDrawable", (__GLXextFuncPtr) glXQueryDrawable },
+   { "glXSelectEvent", (__GLXextFuncPtr) glXSelectEvent },
 
    /*** GLX_VERSION_1_4 ***/
-   { "glXGetProcAddress", (GLvoid *) glXGetProcAddress },
+   { "glXGetProcAddress", (__GLXextFuncPtr) glXGetProcAddress },
 
    /*** GLX_SGI_swap_control ***/
-   { "glXSwapIntervalSGI", (GLvoid *) glXSwapIntervalSGI },
+   { "glXSwapIntervalSGI", (__GLXextFuncPtr) glXSwapIntervalSGI },
 
    /*** GLX_SGI_video_sync ***/
-   { "glXGetVideoSyncSGI", (GLvoid *) glXGetVideoSyncSGI },
-   { "glXWaitVideoSyncSGI", (GLvoid *) glXWaitVideoSyncSGI },
+   { "glXGetVideoSyncSGI", (__GLXextFuncPtr) glXGetVideoSyncSGI },
+   { "glXWaitVideoSyncSGI", (__GLXextFuncPtr) glXWaitVideoSyncSGI },
 
    /*** GLX_SGI_make_current_read ***/
-   { "glXMakeCurrentReadSGI", (GLvoid *) glXMakeCurrentReadSGI },
-   { "glXGetCurrentReadDrawableSGI", (GLvoid *) glXGetCurrentReadDrawableSGI },
+   { "glXMakeCurrentReadSGI", (__GLXextFuncPtr) glXMakeCurrentReadSGI },
+   { "glXGetCurrentReadDrawableSGI", (__GLXextFuncPtr) glXGetCurrentReadDrawableSGI },
 
    /*** GLX_SGIX_video_source ***/
 #if defined(_VL_H)
-   { "glXCreateGLXVideoSourceSGIX", (GLvoid *) glXCreateGLXVideoSourceSGIX },
-   { "glXDestroyGLXVideoSourceSGIX", (GLvoid *) glXDestroyGLXVideoSourceSGIX },
+   { "glXCreateGLXVideoSourceSGIX", (__GLXextFuncPtr) glXCreateGLXVideoSourceSGIX },
+   { "glXDestroyGLXVideoSourceSGIX", (__GLXextFuncPtr) glXDestroyGLXVideoSourceSGIX },
 #endif
 
    /*** GLX_EXT_import_context ***/
-   { "glXFreeContextEXT", (GLvoid *) glXFreeContextEXT },
-   { "glXGetContextIDEXT", (GLvoid *) glXGetContextIDEXT },
-   { "glXGetCurrentDisplayEXT", (GLvoid *) glXGetCurrentDisplayEXT },
-   { "glXImportContextEXT", (GLvoid *) glXImportContextEXT },
-   { "glXQueryContextInfoEXT", (GLvoid *) glXQueryContextInfoEXT },
+   { "glXFreeContextEXT", (__GLXextFuncPtr) glXFreeContextEXT },
+   { "glXGetContextIDEXT", (__GLXextFuncPtr) glXGetContextIDEXT },
+   { "glXGetCurrentDisplayEXT", (__GLXextFuncPtr) glXGetCurrentDisplayEXT },
+   { "glXImportContextEXT", (__GLXextFuncPtr) glXImportContextEXT },
+   { "glXQueryContextInfoEXT", (__GLXextFuncPtr) glXQueryContextInfoEXT },
 
    /*** GLX_SGIX_fbconfig ***/
-   { "glXGetFBConfigAttribSGIX", (GLvoid *) glXGetFBConfigAttribSGIX },
-   { "glXChooseFBConfigSGIX", (GLvoid *) glXChooseFBConfigSGIX },
-   { "glXCreateGLXPixmapWithConfigSGIX", (GLvoid *) glXCreateGLXPixmapWithConfigSGIX },
-   { "glXCreateContextWithConfigSGIX", (GLvoid *) glXCreateContextWithConfigSGIX },
-   { "glXGetVisualFromFBConfigSGIX", (GLvoid *) glXGetVisualFromFBConfigSGIX },
-   { "glXGetFBConfigFromVisualSGIX", (GLvoid *) glXGetFBConfigFromVisualSGIX },
+   { "glXGetFBConfigAttribSGIX", (__GLXextFuncPtr) glXGetFBConfigAttribSGIX },
+   { "glXChooseFBConfigSGIX", (__GLXextFuncPtr) glXChooseFBConfigSGIX },
+   { "glXCreateGLXPixmapWithConfigSGIX", (__GLXextFuncPtr) glXCreateGLXPixmapWithConfigSGIX },
+   { "glXCreateContextWithConfigSGIX", (__GLXextFuncPtr) glXCreateContextWithConfigSGIX },
+   { "glXGetVisualFromFBConfigSGIX", (__GLXextFuncPtr) glXGetVisualFromFBConfigSGIX },
+   { "glXGetFBConfigFromVisualSGIX", (__GLXextFuncPtr) glXGetFBConfigFromVisualSGIX },
 
    /*** GLX_SGIX_pbuffer ***/
-   { "glXCreateGLXPbufferSGIX", (GLvoid *) glXCreateGLXPbufferSGIX },
-   { "glXDestroyGLXPbufferSGIX", (GLvoid *) glXDestroyGLXPbufferSGIX },
-   { "glXQueryGLXPbufferSGIX", (GLvoid *) glXQueryGLXPbufferSGIX },
-   { "glXSelectEventSGIX", (GLvoid *) glXSelectEventSGIX },
-   { "glXGetSelectedEventSGIX", (GLvoid *) glXGetSelectedEventSGIX },
+   { "glXCreateGLXPbufferSGIX", (__GLXextFuncPtr) glXCreateGLXPbufferSGIX },
+   { "glXDestroyGLXPbufferSGIX", (__GLXextFuncPtr) glXDestroyGLXPbufferSGIX },
+   { "glXQueryGLXPbufferSGIX", (__GLXextFuncPtr) glXQueryGLXPbufferSGIX },
+   { "glXSelectEventSGIX", (__GLXextFuncPtr) glXSelectEventSGIX },
+   { "glXGetSelectedEventSGIX", (__GLXextFuncPtr) glXGetSelectedEventSGIX },
 
    /*** GLX_SGI_cushion ***/
-   { "glXCushionSGI", (GLvoid *) glXCushionSGI },
+   { "glXCushionSGI", (__GLXextFuncPtr) glXCushionSGI },
 
    /*** GLX_SGIX_video_resize ***/
-   { "glXBindChannelToWindowSGIX", (GLvoid *) glXBindChannelToWindowSGIX },
-   { "glXChannelRectSGIX", (GLvoid *) glXChannelRectSGIX },
-   { "glXQueryChannelRectSGIX", (GLvoid *) glXQueryChannelRectSGIX },
-   { "glXQueryChannelDeltasSGIX", (GLvoid *) glXQueryChannelDeltasSGIX },
-   { "glXChannelRectSyncSGIX", (GLvoid *) glXChannelRectSyncSGIX },
+   { "glXBindChannelToWindowSGIX", (__GLXextFuncPtr) glXBindChannelToWindowSGIX },
+   { "glXChannelRectSGIX", (__GLXextFuncPtr) glXChannelRectSGIX },
+   { "glXQueryChannelRectSGIX", (__GLXextFuncPtr) glXQueryChannelRectSGIX },
+   { "glXQueryChannelDeltasSGIX", (__GLXextFuncPtr) glXQueryChannelDeltasSGIX },
+   { "glXChannelRectSyncSGIX", (__GLXextFuncPtr) glXChannelRectSyncSGIX },
 
    /*** GLX_SGIX_dmbuffer **/
 #if defined(_DM_BUFFER_H_)
-   { "glXAssociateDMPbufferSGIX", (GLvoid *) glXAssociateDMPbufferSGIX },
+   { "glXAssociateDMPbufferSGIX", (__GLXextFuncPtr) glXAssociateDMPbufferSGIX },
 #endif
 
    /*** GLX_SGIX_swap_group ***/
-   { "glXJoinSwapGroupSGIX", (GLvoid *) glXJoinSwapGroupSGIX },
+   { "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX },
 
    /*** GLX_SGIX_swap_barrier ***/
-   { "glXBindSwapBarrierSGIX", (GLvoid *) glXBindSwapBarrierSGIX },
-   { "glXQueryMaxSwapBarriersSGIX", (GLvoid *) glXQueryMaxSwapBarriersSGIX },
+   { "glXBindSwapBarrierSGIX", (__GLXextFuncPtr) glXBindSwapBarrierSGIX },
+   { "glXQueryMaxSwapBarriersSGIX", (__GLXextFuncPtr) glXQueryMaxSwapBarriersSGIX },
 
    /*** GLX_SUN_get_transparent_index ***/
-   { "glXGetTransparentIndexSUN", (GLvoid *) glXGetTransparentIndexSUN },
+   { "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN },
 
    /*** GLX_MESA_copy_sub_buffer ***/
-   { "glXCopySubBufferMESA", (GLvoid *) glXCopySubBufferMESA },
+   { "glXCopySubBufferMESA", (__GLXextFuncPtr) glXCopySubBufferMESA },
 
    /*** GLX_MESA_pixmap_colormap ***/
-   { "glXCreateGLXPixmapMESA", (GLvoid *) glXCreateGLXPixmapMESA },
+   { "glXCreateGLXPixmapMESA", (__GLXextFuncPtr) glXCreateGLXPixmapMESA },
 
    /*** GLX_MESA_release_buffers ***/
-   { "glXReleaseBuffersMESA", (GLvoid *) glXReleaseBuffersMESA },
+   { "glXReleaseBuffersMESA", (__GLXextFuncPtr) glXReleaseBuffersMESA },
 
    /*** GLX_MESA_set_3dfx_mode ***/
-   { "glXSet3DfxModeMESA", (GLvoid *) glXSet3DfxModeMESA },
+   { "glXSet3DfxModeMESA", (__GLXextFuncPtr) glXSet3DfxModeMESA },
 
    /*** GLX_ARB_get_proc_address ***/
-   { "glXGetProcAddressARB", (GLvoid *) glXGetProcAddressARB },
+   { "glXGetProcAddressARB", (__GLXextFuncPtr) glXGetProcAddressARB },
 
    /*** GLX_NV_vertex_array_range ***/
-   { "glXAllocateMemoryNV", (GLvoid *) glXAllocateMemoryNV },
-   { "glXFreeMemoryNV", (GLvoid *) glXFreeMemoryNV },
+   { "glXAllocateMemoryNV", (__GLXextFuncPtr) glXAllocateMemoryNV },
+   { "glXFreeMemoryNV", (__GLXextFuncPtr) glXFreeMemoryNV },
 
    /*** GLX_MESA_agp_offset ***/
-   { "glXGetAGPOffsetMESA", (GLvoid *) glXGetAGPOffsetMESA },
+   { "glXGetAGPOffsetMESA", (__GLXextFuncPtr) glXGetAGPOffsetMESA },
 
    /*** GLX_ARB_render_texture ***/
-   { "glXBindTexImageARB", (GLvoid *) glXBindTexImageARB },
-   { "glXReleaseTexImageARB", (GLvoid *) glXReleaseTexImageARB },
-   { "glXDrawableAttribARB", (GLvoid *) glXDrawableAttribARB },
+   { "glXBindTexImageARB", (__GLXextFuncPtr) glXBindTexImageARB },
+   { "glXReleaseTexImageARB", (__GLXextFuncPtr) glXReleaseTexImageARB },
+   { "glXDrawableAttribARB", (__GLXextFuncPtr) glXDrawableAttribARB },
 
    { NULL, NULL }   /* end of list */
 };
@@ -1304,7 +1304,7 @@ static struct name_address_pair GLX_functions[] = {
 /*
  * Return address of named glX function, or NULL if not found.
  */
-const GLvoid *
+__GLXextFuncPtr
 _glxapi_get_proc_address(const char *funcName)
 {
    GLuint i;
@@ -1321,17 +1321,17 @@ _glxapi_get_proc_address(const char *funcName)
  * This function does not get dispatched through the dispatch table
  * since it's really a "meta" function.
  */
-void (*glXGetProcAddressARB(const GLubyte *procName))()
+__GLXextFuncPtr
+glXGetProcAddressARB(const GLubyte *procName)
 {
-   typedef void (*gl_function)();
-   gl_function f;
+   __GLXextFuncPtr f;
 
-   f = (gl_function) _glxapi_get_proc_address((const char *) procName);
+   f = _glxapi_get_proc_address((const char *) procName);
    if (f) {
       return f;
    }
 
-   f = (gl_function) _glapi_get_proc_address((const char *) procName);
+   f = (__GLXextFuncPtr) _glapi_get_proc_address((const char *) procName);
    return f;
 }
 
diff --git a/extras/Mesa/src/mesa/drivers/x11/glxapi.h b/extras/Mesa/src/mesa/drivers/x11/glxapi.h
index 6f09a68fe..d6bc15764 100644
--- a/extras/Mesa/src/mesa/drivers/x11/glxapi.h
+++ b/extras/Mesa/src/mesa/drivers/x11/glxapi.h
@@ -229,7 +229,7 @@ extern void
 _glxapi_set_no_op_table(struct _glxapi_table *t);
 
 
-extern const GLvoid *
+extern __GLXextFuncPtr
 _glxapi_get_proc_address(const char *funcName);
 
 
diff --git a/extras/Mesa/src/mesa/drivers/x11/xm_span.c b/extras/Mesa/src/mesa/drivers/x11/xm_span.c
index 71a4c8008..e8813681b 100644
--- a/extras/Mesa/src/mesa/drivers/x11/xm_span.c
+++ b/extras/Mesa/src/mesa/drivers/x11/xm_span.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.2.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -3456,6 +3456,49 @@ static void write_pixels_index_ximage( INDEX_PIXELS_ARGS )
 /*****                      Pixel reading                         *****/
 /**********************************************************************/
 
+#ifndef XFree86Server
+/**
+ * Do clip testing prior to calling XGetImage.  If any of the region lies
+ * outside the screen's bounds, XGetImage will return NULL.
+ * We use XTranslateCoordinates() to check if that's the case and
+ * adjust the x, y and length parameters accordingly.
+ * \return  -1 if span is totally clipped away,
+ *          else return number of pixels to skip in the destination array.
+ */
+static int
+clip_for_xgetimage(XMesaContext xmesa, GLuint *n, GLint *x, GLint *y)
+{
+   XMesaBuffer source = xmesa->xm_buffer;
+   Window rootWin = RootWindow(xmesa->display, 0);
+   Window child;
+   int screenWidth = WidthOfScreen(DefaultScreenOfDisplay(xmesa->display));
+   int dx, dy;
+   if (source->type == PBUFFER)
+      return 0;
+   XTranslateCoordinates(xmesa->display, source->buffer, rootWin,
+                         *x, *y, &dx, &dy, &child);
+   if (dx >= screenWidth) {
+      /* totally clipped on right */
+      return -1;
+   }
+   if (dx < 0) {
+      /* clipped on left */
+      int clip = -dx;
+      if (clip >= *n)
+         return -1;  /* totally clipped on left */
+      *x += clip;
+      *n -= clip;
+      dx = 0;
+      return clip;
+   }
+   if (dx + *n > screenWidth) {
+      /* clipped on right */
+      int clip = dx + *n - screenWidth;
+      *n -= clip;
+   }
+   return 0;
+}
+#endif
 
 
 /*
@@ -3474,6 +3517,11 @@ static void read_index_span( const GLcontext *ctx,
 #ifndef XFree86Server
       XMesaImage *span = NULL;
       int error;
+      int k = clip_for_xgetimage(xmesa, &n, &x, &y);
+      if (k < 0)
+         return;
+      index += k;
+
       catch_xgetimage_errors( xmesa->display );
       span = XGetImage( xmesa->display, source->buffer,
 		        x, y, n, 1, AllPlanes, ZPixmap );
@@ -3530,9 +3578,15 @@ static void read_color_span( const GLcontext *ctx,
 				  x, FLIP(source, y), n, 1, ZPixmap,
 				  ~0L, (pointer)span->data);
 #else
+      int k;
+      y = FLIP(source, y);
+      k = clip_for_xgetimage(xmesa, &n, &x, &y);
+      if (k < 0)
+         return;
+      rgba += k;
       catch_xgetimage_errors( xmesa->display );
       span = XGetImage( xmesa->display, source->buffer,
-		        x, FLIP(source, y), n, 1, AllPlanes, ZPixmap );
+		        x, y, n, 1, AllPlanes, ZPixmap );
       error = check_xgetimage_errors();
 #endif
       if (span && !error) {
diff --git a/extras/Mesa/src/mesa/drivers/x11/xm_tri.c b/extras/Mesa/src/mesa/drivers/x11/xm_tri.c
index f018a6aca..970fb0e47 100644
--- a/extras/Mesa/src/mesa/drivers/x11/xm_tri.c
+++ b/extras/Mesa/src/mesa/drivers/x11/xm_tri.c
@@ -1352,7 +1352,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
                   USE(smooth_DITHER8_z_triangle);
                else
                   USE(smooth_DITHER_z_triangle);
-               break;
             case PF_Lookup:
                if (depth == 8)
                   USE(smooth_LOOKUP8_z_triangle);
@@ -1390,7 +1389,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
                   USE(flat_DITHER8_z_triangle);
                else
                   USE(flat_DITHER_z_triangle);
-               break;
             case PF_Lookup:
                if (depth == 8)
                   USE(flat_LOOKUP8_z_triangle);
@@ -1425,7 +1423,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
                   USE(smooth_DITHER8_triangle);
                else
                   USE(smooth_DITHER_triangle);
-               break;
             case PF_Lookup:
                if (depth == 8)
                   USE(smooth_LOOKUP8_triangle);
@@ -1461,7 +1458,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
                   USE(flat_DITHER8_triangle);
                else
                   USE(flat_DITHER_triangle);
-               break;
             case PF_Lookup:
                if (depth == 8)
                   USE(flat_LOOKUP8_triangle);
diff --git a/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py b/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py
index 4fdb82df6..c4afc4e52 100755
--- a/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py
+++ b/extras/Mesa/src/mesa/glapi/gl_SPARC_asm.py
@@ -48,7 +48,7 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase):
 		print ''
 		print '#define GLOBL_FN(x) .globl x ; .type x,#function'
 		print ''
-		print '#if defined(__sparc_v9__) && !defined(__linux__)'
+		print '#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))'
 		print '#  define GL_STUB(fn,off)\t\t\t\t\\'
 		print 'GLOBL_FN(fn) ; fn:\t\t\t\t\t\\'
 		print '\tsethi\t%hi(0x00000000), %g4 ;\t\t\t\\'
diff --git a/extras/Mesa/src/mesa/glapi/gl_apitemp.py b/extras/Mesa/src/mesa/glapi/gl_apitemp.py
index b8b32ac36..6f6abd018 100755
--- a/extras/Mesa/src/mesa/glapi/gl_apitemp.py
+++ b/extras/Mesa/src/mesa/glapi/gl_apitemp.py
@@ -149,7 +149,7 @@ GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
 #error TABLE_ENTRY must be defined
 #endif
 
-static void * DISPATCH_TABLE_NAME[] = {"""
+static _glapi_proc DISPATCH_TABLE_NAME[] = {"""
 		keys = self.functions.keys()
 		keys.sort()
 		for k in keys:
@@ -176,7 +176,7 @@ static void * DISPATCH_TABLE_NAME[] = {"""
  * We list the functions which are not otherwise used.
  */
 #ifdef UNUSED_TABLE_NAME
-static const void * const UNUSED_TABLE_NAME[] = {"""
+static _glapi_proc UNUSED_TABLE_NAME[] = {"""
 
 		keys = self.functions.keys()
 		keys.sort()
diff --git a/extras/Mesa/src/mesa/glapi/gl_procs.py b/extras/Mesa/src/mesa/glapi/gl_procs.py
index e5f575211..f9ce8e2da 100755
--- a/extras/Mesa/src/mesa/glapi/gl_procs.py
+++ b/extras/Mesa/src/mesa/glapi/gl_procs.py
@@ -50,15 +50,15 @@ class PrintGlProcs(gl_XML.FilterGLAPISpecBase):
 		print ' */'
 		print ''
 		print 'typedef struct {'
-		print '    int Name_offset;'
+		print '    GLint Name_offset;'
 		print '#ifdef NEED_FUNCTION_POINTER'
-		print '    void * Address;'
+		print '    _glapi_proc Address;'
 		print '#endif'
-		print '    unsigned int Offset;'
+		print '    GLuint Offset;'
 		print '} glprocs_table_t;'
 		print ''
 		print '#ifdef NEED_FUNCTION_POINTER'
-		print '#  define NAME_FUNC_OFFSET(n,f,o) { n , (void *) f , o }'
+		print '#  define NAME_FUNC_OFFSET(n,f,o) { n , (_glapi_proc) f , o }'
 		print '#else'
 		print '#  define NAME_FUNC_OFFSET(n,f,o) { n , o }'
 		print '#endif'
@@ -132,7 +132,7 @@ class PrintGlProcs(gl_XML.FilterGLAPISpecBase):
 
 			base_offset += len(self.functions[k].name) + 3
 
-		print '    NAME_FUNC_OFFSET( -1, NULL, -1 )'
+		print '    NAME_FUNC_OFFSET( -1, NULL, 0 )'
 		print '};'
 		return
 
diff --git a/extras/Mesa/src/mesa/glapi/glapi.c b/extras/Mesa/src/mesa/glapi/glapi.c
index 0f0add891..f395d1879 100644
--- a/extras/Mesa/src/mesa/glapi/glapi.c
+++ b/extras/Mesa/src/mesa/glapi/glapi.c
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.3
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -100,25 +99,23 @@ warn(void)
 
 #define F NULL
 
-#define DISPATCH(func, args, msg)					\
-   if (warn()) {							\
-      warning_func(NULL, "GL User Error: called without context:");	\
-      warning_func msg;							\
+#define DISPATCH(func, args, msg)					      \
+   if (warn()) {							      \
+      warning_func(NULL, "GL User Error: called without context: %s", #func); \
    }
 
-#define RETURN_DISPATCH(func, args, msg)				\
-   if (warn()) {							\
-      warning_func(NULL, "GL User Error: called without context:");	\
-      warning_func msg;							\
-   }									\
+#define RETURN_DISPATCH(func, args, msg)				      \
+   if (warn()) {							      \
+      warning_func(NULL, "GL User Error: called without context: %s", #func); \
+   }									      \
    return 0
 
 #define DISPATCH_TABLE_NAME __glapi_noop_table
-#define UNUSED_TABLE_NAME __usused_noop_functions
+#define UNUSED_TABLE_NAME __unused_noop_functions
 
-#define TABLE_ENTRY(name) (void *) NoOp##name
+#define TABLE_ENTRY(name) (_glapi_proc) NoOp##name
 
-static int NoOpUnused(void)
+static GLint NoOpUnused(void)
 {
    if (warn()) {
       warning_func(NULL, "GL User Error: calling extension function without a current context\n");
@@ -171,11 +168,11 @@ static _glthread_TSD ContextTSD;         /**< Per-thread context pointer */
 
 
 #define DISPATCH_TABLE_NAME __glapi_threadsafe_table
-#define UNUSED_TABLE_NAME __usused_threadsafe_functions
+#define UNUSED_TABLE_NAME __unused_threadsafe_functions
 
-#define TABLE_ENTRY(name) (void *) gl##name
+#define TABLE_ENTRY(name) (_glapi_proc) gl##name
 
-static int glUnused(void)
+static GLint glUnused(void)
 {
    return 0;
 }
@@ -203,7 +200,8 @@ static GLboolean DispatchOverride = GL_FALSE;
 
 
 
-/* strdup() is actually not a standard ANSI C or POSIX routine.
+/**
+ * strdup() is actually not a standard ANSI C or POSIX routine.
  * Irix will not define it if ANSI mode is in effect.
  */
 static char *
@@ -219,7 +217,7 @@ str_dup(const char *str)
 
 
 
-/*
+/**
  * We should call this periodically from a function such as glXMakeCurrent
  * in order to test if multiple threads are being used.
  */
@@ -248,7 +246,7 @@ _glapi_check_multithread(void)
 
 
 
-/*
+/**
  * Set the current context pointer for this thread.
  * The context pointer is an opaque type which should be cast to
  * void from the real context pointer type.
@@ -256,7 +254,9 @@ _glapi_check_multithread(void)
 void
 _glapi_set_context(void *context)
 {
+   (void) __unused_noop_functions; /* silence a warning */
 #if defined(THREADS)
+   (void) __unused_threadsafe_functions; /* silence a warning */
    _glthread_SetTSD(&ContextTSD, context);
    _glapi_Context = (ThreadSafe) ? NULL : context;
 #else
@@ -266,7 +266,7 @@ _glapi_set_context(void *context)
 
 
 
-/*
+/**
  * Get the current context pointer for this thread.
  * The context pointer is an opaque type which should be cast from
  * void to the real context pointer type.
@@ -288,7 +288,7 @@ _glapi_get_context(void)
 
 
 
-/*
+/**
  * Set the global or per-thread dispatch table pointer.
  */
 void
@@ -336,7 +336,7 @@ _glapi_set_dispatch(struct _glapi_table *dispatch)
 
 
 
-/*
+/**
  * Return pointer to current dispatch table for calling thread.
  */
 struct _glapi_table *
@@ -452,13 +452,6 @@ _glapi_get_override_dispatch(int layer)
 }
 
 
-struct name_address_offset {
-   const char *Name;
-   GLvoid *Address;
-   GLuint Offset;
-};
-
-
 #if !defined( USE_X86_ASM )
 #define NEED_FUNCTION_POINTER
 #endif
@@ -467,12 +460,16 @@ struct name_address_offset {
 #include "glprocs.h"
 
 
+/**
+ * Search the table of static entrypoint functions for the named function
+ * and return the corresponding glprocs_table_t entry.
+ */
 static const glprocs_table_t *
 find_entry( const char * n )
 {
-   unsigned   i;
+   GLuint i;
 
-   for ( i = 0 ; static_functions[i].Name_offset >= 0 ; i++ ) {
+   for (i = 0; static_functions[i].Name_offset >= 0; i++) {
       const char * test_name;
 
       test_name = gl_string_table + static_functions[i].Name_offset;
@@ -483,7 +480,8 @@ find_entry( const char * n )
    return NULL;
 }
 
-/*
+
+/**
  * Return dispatch table offset of the named static (built-in) function.
  * Return -1 if function not found.
  */
@@ -509,18 +507,18 @@ extern const GLubyte gl_dispatch_functions_start[];
 # endif
 
 
-/*
+/**
  * Return dispatch function address the named static (built-in) function.
  * Return NULL if function not found.
  */
-static const GLvoid *
+static const _glapi_proc
 get_static_proc_address(const char *funcName)
 {
    const glprocs_table_t * const f = find_entry( funcName );
 
    if ( f != NULL ) {
-      return gl_dispatch_functions_start 
-	   + (X86_DISPATCH_FUNCTION_SIZE * f->Offset);
+      return (_glapi_proc) (gl_dispatch_functions_start 
+                            + (X86_DISPATCH_FUNCTION_SIZE * f->Offset));
    }
    else {
       return NULL;
@@ -530,11 +528,11 @@ get_static_proc_address(const char *funcName)
 #else
 
 
-/*
- * Return dispatch function address the named static (built-in) function.
- * Return NULL if function not found.
+/**
+ * Return pointer to the named static (built-in) function.
+ * \return  NULL if function not found.
  */
-static const GLvoid *
+static const _glapi_proc
 get_static_proc_address(const char *funcName)
 {
    const glprocs_table_t * const f = find_entry( funcName );
@@ -544,12 +542,16 @@ get_static_proc_address(const char *funcName)
 #endif /* USE_X86_ASM */
 
 
+/**
+ * Return the name of the function at the given offset in the dispatch
+ * table.  For debugging only.
+ */
 static const char *
 get_static_proc_name( GLuint offset )
 {
-   unsigned   i;
+   GLuint i;
 
-   for ( i = 0 ; static_functions[i].Name_offset >= 0 ; i++ ) {
+   for (i = 0; static_functions[i].Name_offset >= 0; i++) {
       if (static_functions[i].Offset == offset) {
 	 return gl_string_table + static_functions[i].Name_offset;
       }
@@ -570,7 +572,7 @@ get_static_proc_name( GLuint offset )
 
 
 /*
- * The disptach table size (number of entries) is the sizeof the
+ * The dispatch table size (number of entries) is the size of the
  * _glapi_table struct plus the number of dynamic entries we can add.
  * The extra slots can be filled in by DRI drivers that register new extension
  * functions.
@@ -578,6 +580,13 @@ get_static_proc_name( GLuint offset )
 #define DISPATCH_TABLE_SIZE (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS)
 
 
+struct name_address_offset {
+   const char *Name;
+   _glapi_proc Address;
+   GLuint Offset;
+};
+
+
 static struct name_address_offset ExtEntryTable[MAX_EXTENSION_FUNCS];
 static GLuint NumExtEntryPoints = 0;
 
@@ -585,12 +594,12 @@ static GLuint NumExtEntryPoints = 0;
 extern void __glapi_sparc_icache_flush(unsigned int *);
 #endif
 
-/*
+/**
  * Generate a dispatch function (entrypoint) which jumps through
  * the given slot number (offset) in the current dispatch table.
  * We need assembly language in order to accomplish this.
  */
-static void *
+static _glapi_proc
 generate_entrypoint(GLuint functionOffset)
 {
 #if defined(USE_X86_ASM)
@@ -633,10 +642,10 @@ generate_entrypoint(GLuint functionOffset)
       *(unsigned int *)(code + 0x10) = (unsigned int)_glapi_get_dispatch - next_insn;
       *(unsigned int *)(code + 0x16) = (unsigned int)functionOffset * 4;
    }
-   return code;
+   return (_glapi_proc) code;
 #elif defined(USE_SPARC_ASM)
 
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
    static const unsigned int insn_template[] = {
 	   0x05000000,	/* sethi	%uhi(_glapi_Dispatch), %g2	*/
 	   0x03000000,	/* sethi	%hi(_glapi_Dispatch), %g1	*/
@@ -664,7 +673,7 @@ generate_entrypoint(GLuint functionOffset)
    if (code) {
       memcpy(code, insn_template, sizeof(insn_template));
 
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
       code[0] |= (glapi_addr >> (32 + 10));
       code[1] |= ((glapi_addr & 0xffffffff) >> 10);
       __glapi_sparc_icache_flush(&code[0]);
@@ -682,7 +691,7 @@ generate_entrypoint(GLuint functionOffset)
       __glapi_sparc_icache_flush(&code[2]);
 #endif
    }
-   return code;
+   return (_glapi_proc) code;
 #else
    (void) functionOffset;
    return NULL;
@@ -690,12 +699,12 @@ generate_entrypoint(GLuint functionOffset)
 }
 
 
-/*
+/**
  * This function inserts a new dispatch offset into the assembly language
  * stub that was generated with the preceeding function.
  */
 static void
-fill_in_entrypoint_offset(void *entrypoint, GLuint offset)
+fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset)
 {
 #if defined(USE_X86_ASM)
 
@@ -707,7 +716,7 @@ fill_in_entrypoint_offset(void *entrypoint, GLuint offset)
 
    /* XXX this hasn't been tested! */
    unsigned int *code = (unsigned int *) entrypoint;
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
    code[6] = 0x05000000;  /* sethi	%hi(8 * glapioffset), %g2	*/
    code[7] = 0x8410a000;  /* or		%g2, %lo(8 * glapioffset), %g2	*/
    code[6] |= ((offset * 8) >> 10);
@@ -729,7 +738,7 @@ fill_in_entrypoint_offset(void *entrypoint, GLuint offset)
 }
 
 
-/*
+/**
  * Add a new extension function entrypoint.
  * Return: GL_TRUE = success or GL_FALSE = failure
  */
@@ -785,7 +794,7 @@ _glapi_add_entrypoint(const char *funcName, GLuint offset)
       return GL_FALSE;
    }
    else {
-      void *entrypoint = generate_entrypoint(offset);
+      _glapi_proc entrypoint = generate_entrypoint(offset);
       if (!entrypoint)
          return GL_FALSE; /* couldn't generate assembly */
 
@@ -803,7 +812,7 @@ _glapi_add_entrypoint(const char *funcName, GLuint offset)
 }
 
 
-/*
+/**
  * Return offset of entrypoint for named function within dispatch table.
  */
 GLint
@@ -823,10 +832,12 @@ _glapi_get_proc_offset(const char *funcName)
 
 
 
-/*
- * Return entrypoint for named function.
+/**
+ * Return pointer to the named function.  If the function name isn't found
+ * in the name of static functions, try generating a new API entrypoint on
+ * the fly with assembly language.
  */
-const GLvoid *
+const _glapi_proc
 _glapi_get_proc_address(const char *funcName)
 {
    GLuint i;
@@ -848,7 +859,7 @@ _glapi_get_proc_address(const char *funcName)
 
    /* search static functions */
    {
-      const GLvoid *func = get_static_proc_address(funcName);
+      const _glapi_proc func = get_static_proc_address(funcName);
       if (func)
          return func;
    }
@@ -860,7 +871,7 @@ _glapi_get_proc_address(const char *funcName)
     * when you try calling a GL function that doesn't really exist.
     */
    if (NumExtEntryPoints < MAX_EXTENSION_FUNCS) {
-      GLvoid *entrypoint = generate_entrypoint(~0);
+      _glapi_proc entrypoint = generate_entrypoint(~0);
       if (!entrypoint)
          return GL_FALSE;
 
@@ -879,7 +890,7 @@ _glapi_get_proc_address(const char *funcName)
 
 
 
-/*
+/**
  * Return the name of the function at the given dispatch offset.
  * This is only intended for debugging.
  */
@@ -906,7 +917,7 @@ _glapi_get_proc_name(GLuint offset)
 
 
 
-/*
+/**
  * Return size of dispatch table struct as number of functions (or
  * slots).
  */
@@ -918,7 +929,7 @@ _glapi_get_dispatch_table_size(void)
 
 
 
-/*
+/**
  * Get API dispatcher version string.
  */
 const char *
@@ -929,7 +940,7 @@ _glapi_get_version(void)
 
 
 
-/*
+/**
  * Make sure there are no NULL pointers in the given dispatch table.
  * Intended for debugging purposes.
  */
@@ -995,7 +1006,7 @@ _glapi_check_table(const struct _glapi_table *table)
       GLuint offset = (secondaryColor3fFunc - (char *) table) / sizeof(void *);
       assert(secondaryColor3fOffset == _gloffset_SecondaryColor3fEXT);
       assert(secondaryColor3fOffset == offset);
-      assert(_glapi_get_proc_address("glSecondaryColor3fEXT") == (void *) &glSecondaryColor3fEXT);
+      assert(_glapi_get_proc_address("glSecondaryColor3fEXT") == (_glapi_proc) &glSecondaryColor3fEXT);
    }
    {
       GLuint pointParameterivOffset = _glapi_get_proc_offset("glPointParameterivNV");
@@ -1003,7 +1014,7 @@ _glapi_check_table(const struct _glapi_table *table)
       GLuint offset = (pointParameterivFunc - (char *) table) / sizeof(void *);
       assert(pointParameterivOffset == _gloffset_PointParameterivNV);
       assert(pointParameterivOffset == offset);
-      assert(_glapi_get_proc_address("glPointParameterivNV") == (void *) &glPointParameterivNV);
+      assert(_glapi_get_proc_address("glPointParameterivNV") == (_glapi_proc) &glPointParameterivNV);
    }
    {
       GLuint setFenceOffset = _glapi_get_proc_offset("glSetFenceNV");
@@ -1011,7 +1022,7 @@ _glapi_check_table(const struct _glapi_table *table)
       GLuint offset = (setFenceFunc - (char *) table) / sizeof(void *);
       assert(setFenceOffset == _gloffset_SetFenceNV);
       assert(setFenceOffset == offset);
-      assert(_glapi_get_proc_address("glSetFenceNV") == (void *) &glSetFenceNV);
+      assert(_glapi_get_proc_address("glSetFenceNV") == (_glapi_proc) &glSetFenceNV);
    }
 #else
    (void) table;
diff --git a/extras/Mesa/src/mesa/glapi/glapi.h b/extras/Mesa/src/mesa/glapi/glapi.h
index 32cd2c812..7cdccc127 100644
--- a/extras/Mesa/src/mesa/glapi/glapi.h
+++ b/extras/Mesa/src/mesa/glapi/glapi.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.2
+ * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -51,6 +51,8 @@ struct _glapi_table;
 
 typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
 
 extern void *_glapi_Context;
 
@@ -115,7 +117,7 @@ extern GLint
 _glapi_get_proc_offset(const char *funcName);
 
 
-extern const GLvoid *
+extern const _glapi_proc
 _glapi_get_proc_address(const char *funcName);
 
 
diff --git a/extras/Mesa/src/mesa/glapi/glapitemp.h b/extras/Mesa/src/mesa/glapi/glapitemp.h
index 579494ce8..948b880af 100644
--- a/extras/Mesa/src/mesa/glapi/glapitemp.h
+++ b/extras/Mesa/src/mesa/glapi/glapitemp.h
@@ -4669,7 +4669,7 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvSGIS)(GLenum pname, const GLfloat *
 #error TABLE_ENTRY must be defined
 #endif
 
-static void * DISPATCH_TABLE_NAME[] = {
+static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(NewList),
    TABLE_ENTRY(EndList),
    TABLE_ENTRY(CallList),
@@ -5493,7 +5493,7 @@ static void * DISPATCH_TABLE_NAME[] = {
  * We list the functions which are not otherwise used.
  */
 #ifdef UNUSED_TABLE_NAME
-static const void * const UNUSED_TABLE_NAME[] = {
+static _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(ActiveTexture),
    TABLE_ENTRY(ClientActiveTexture),
    TABLE_ENTRY(MultiTexCoord1d),
diff --git a/extras/Mesa/src/mesa/glapi/glprocs.h b/extras/Mesa/src/mesa/glapi/glprocs.h
index 3c12bd4b1..348e18ef5 100644
--- a/extras/Mesa/src/mesa/glapi/glprocs.h
+++ b/extras/Mesa/src/mesa/glapi/glprocs.h
@@ -31,939 +31,939 @@
  */
 
 typedef struct {
-    int Name_offset;
+    GLint Name_offset;
 #ifdef NEED_FUNCTION_POINTER
-    void * Address;
+    _glapi_proc Address;
 #endif
-    unsigned int Offset;
+    GLuint Offset;
 } glprocs_table_t;
 
 #ifdef NEED_FUNCTION_POINTER
-#  define NAME_FUNC_OFFSET(n,f,o) { n , (void *) f , o }
+#  define NAME_FUNC_OFFSET(n,f,o) { n , (_glapi_proc) f , o }
 #else
 #  define NAME_FUNC_OFFSET(n,f,o) { n , o }
 #endif
 
 
-static const char gl_string_table[] = {
-    'g','l', 'N', 'e', 'w', 'L', 'i', 's', 't', '\0',
-    'g','l', 'E', 'n', 'd', 'L', 'i', 's', 't', '\0',
-    'g','l', 'C', 'a', 'l', 'l', 'L', 'i', 's', 't', '\0',
-    'g','l', 'C', 'a', 'l', 'l', 'L', 'i', 's', 't', 's', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'L', 'i', 's', 't', 's', '\0',
-    'g','l', 'G', 'e', 'n', 'L', 'i', 's', 't', 's', '\0',
-    'g','l', 'L', 'i', 's', 't', 'B', 'a', 's', 'e', '\0',
-    'g','l', 'B', 'e', 'g', 'i', 'n', '\0',
-    'g','l', 'B', 'i', 't', 'm', 'a', 'p', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'b', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'b', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'd', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'd', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'f', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'f', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'i', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 's', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 's', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'b', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'b', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'i', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'u', 's', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '3', 'u', 's', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'b', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'b', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'd', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'd', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'f', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'f', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'i', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 's', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 's', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'u', 'b', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'u', 'b', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'u', 'i', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'u', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'u', 's', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', '4', 'u', 's', 'v', '\0',
-    'g','l', 'E', 'd', 'g', 'e', 'F', 'l', 'a', 'g', '\0',
-    'g','l', 'E', 'd', 'g', 'e', 'F', 'l', 'a', 'g', 'v', '\0',
-    'g','l', 'E', 'n', 'd', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'd', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'd', 'v', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'f', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'f', 'v', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'i', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'i', 'v', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 's', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 's', 'v', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'b', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'b', 'v', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'd', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'd', 'v', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'f', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'f', 'v', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'i', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 'i', 'v', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 's', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', '3', 's', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 'd', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 'd', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 'f', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 'f', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 'i', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 'i', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 's', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '2', 's', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 'd', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 'd', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 'f', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 'f', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 'i', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 'i', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 's', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '3', 's', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 'd', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 'd', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 'f', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 'f', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 'i', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 'i', 'v', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 's', '\0',
-    'g','l', 'R', 'a', 's', 't', 'e', 'r', 'P', 'o', 's', '4', 's', 'v', '\0',
-    'g','l', 'R', 'e', 'c', 't', 'd', '\0',
-    'g','l', 'R', 'e', 'c', 't', 'd', 'v', '\0',
-    'g','l', 'R', 'e', 'c', 't', 'f', '\0',
-    'g','l', 'R', 'e', 'c', 't', 'f', 'v', '\0',
-    'g','l', 'R', 'e', 'c', 't', 'i', '\0',
-    'g','l', 'R', 'e', 'c', 't', 'i', 'v', '\0',
-    'g','l', 'R', 'e', 'c', 't', 's', '\0',
-    'g','l', 'R', 'e', 'c', 't', 's', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'd', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'd', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'i', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 's', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 's', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'd', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'd', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'i', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 's', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 's', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'd', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'd', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'i', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 's', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 's', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'd', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'd', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'i', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 's', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 's', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 'd', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 'd', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 'f', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 'f', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 'i', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 'i', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 's', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '2', 's', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 'd', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 'd', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 'f', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 'f', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 'i', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 'i', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 's', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '3', 's', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 'd', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 'd', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 'f', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 'f', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 'i', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 'i', 'v', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 's', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', '4', 's', 'v', '\0',
-    'g','l', 'C', 'l', 'i', 'p', 'P', 'l', 'a', 'n', 'e', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', '\0',
-    'g','l', 'C', 'u', 'l', 'l', 'F', 'a', 'c', 'e', '\0',
-    'g','l', 'F', 'o', 'g', 'f', '\0',
-    'g','l', 'F', 'o', 'g', 'f', 'v', '\0',
-    'g','l', 'F', 'o', 'g', 'i', '\0',
-    'g','l', 'F', 'o', 'g', 'i', 'v', '\0',
-    'g','l', 'F', 'r', 'o', 'n', 't', 'F', 'a', 'c', 'e', '\0',
-    'g','l', 'H', 'i', 'n', 't', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'f', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'f', 'v', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'i', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'i', 'v', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'f', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'f', 'v', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'i', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'i', 'v', '\0',
-    'g','l', 'L', 'i', 'n', 'e', 'S', 't', 'i', 'p', 'p', 'l', 'e', '\0',
-    'g','l', 'L', 'i', 'n', 'e', 'W', 'i', 'd', 't', 'h', '\0',
-    'g','l', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'f', '\0',
-    'g','l', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'f', 'v', '\0',
-    'g','l', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'i', '\0',
-    'g','l', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'i', 'v', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'S', 'i', 'z', 'e', '\0',
-    'g','l', 'P', 'o', 'l', 'y', 'g', 'o', 'n', 'M', 'o', 'd', 'e', '\0',
-    'g','l', 'P', 'o', 'l', 'y', 'g', 'o', 'n', 'S', 't', 'i', 'p', 'p', 'l', 'e', '\0',
-    'g','l', 'S', 'c', 'i', 's', 's', 'o', 'r', '\0',
-    'g','l', 'S', 'h', 'a', 'd', 'e', 'M', 'o', 'd', 'e', 'l', '\0',
-    'g','l', 'T', 'e', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '1', 'D', '\0',
-    'g','l', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '2', 'D', '\0',
-    'g','l', 'T', 'e', 'x', 'E', 'n', 'v', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'E', 'n', 'v', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'E', 'n', 'v', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'E', 'n', 'v', 'i', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'G', 'e', 'n', 'd', '\0',
-    'g','l', 'T', 'e', 'x', 'G', 'e', 'n', 'd', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'G', 'e', 'n', 'f', '\0',
-    'g','l', 'T', 'e', 'x', 'G', 'e', 'n', 'f', 'v', '\0',
-    'g','l', 'T', 'e', 'x', 'G', 'e', 'n', 'i', '\0',
-    'g','l', 'T', 'e', 'x', 'G', 'e', 'n', 'i', 'v', '\0',
-    'g','l', 'F', 'e', 'e', 'd', 'b', 'a', 'c', 'k', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'S', 'e', 'l', 'e', 'c', 't', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'R', 'e', 'n', 'd', 'e', 'r', 'M', 'o', 'd', 'e', '\0',
-    'g','l', 'I', 'n', 'i', 't', 'N', 'a', 'm', 'e', 's', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'N', 'a', 'm', 'e', '\0',
-    'g','l', 'P', 'a', 's', 's', 'T', 'h', 'r', 'o', 'u', 'g', 'h', '\0',
-    'g','l', 'P', 'o', 'p', 'N', 'a', 'm', 'e', '\0',
-    'g','l', 'P', 'u', 's', 'h', 'N', 'a', 'm', 'e', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'C', 'l', 'e', 'a', 'r', '\0',
-    'g','l', 'C', 'l', 'e', 'a', 'r', 'A', 'c', 'c', 'u', 'm', '\0',
-    'g','l', 'C', 'l', 'e', 'a', 'r', 'I', 'n', 'd', 'e', 'x', '\0',
-    'g','l', 'C', 'l', 'e', 'a', 'r', 'C', 'o', 'l', 'o', 'r', '\0',
-    'g','l', 'C', 'l', 'e', 'a', 'r', 'S', 't', 'e', 'n', 'c', 'i', 'l', '\0',
-    'g','l', 'C', 'l', 'e', 'a', 'r', 'D', 'e', 'p', 't', 'h', '\0',
-    'g','l', 'S', 't', 'e', 'n', 'c', 'i', 'l', 'M', 'a', 's', 'k', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'M', 'a', 's', 'k', '\0',
-    'g','l', 'D', 'e', 'p', 't', 'h', 'M', 'a', 's', 'k', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'M', 'a', 's', 'k', '\0',
-    'g','l', 'A', 'c', 'c', 'u', 'm', '\0',
-    'g','l', 'D', 'i', 's', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'E', 'n', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'F', 'i', 'n', 'i', 's', 'h', '\0',
-    'g','l', 'F', 'l', 'u', 's', 'h', '\0',
-    'g','l', 'P', 'o', 'p', 'A', 't', 't', 'r', 'i', 'b', '\0',
-    'g','l', 'P', 'u', 's', 'h', 'A', 't', 't', 'r', 'i', 'b', '\0',
-    'g','l', 'M', 'a', 'p', '1', 'd', '\0',
-    'g','l', 'M', 'a', 'p', '1', 'f', '\0',
-    'g','l', 'M', 'a', 'p', '2', 'd', '\0',
-    'g','l', 'M', 'a', 'p', '2', 'f', '\0',
-    'g','l', 'M', 'a', 'p', 'G', 'r', 'i', 'd', '1', 'd', '\0',
-    'g','l', 'M', 'a', 'p', 'G', 'r', 'i', 'd', '1', 'f', '\0',
-    'g','l', 'M', 'a', 'p', 'G', 'r', 'i', 'd', '2', 'd', '\0',
-    'g','l', 'M', 'a', 'p', 'G', 'r', 'i', 'd', '2', 'f', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '1', 'd', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '1', 'd', 'v', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '1', 'f', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '1', 'f', 'v', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '2', 'd', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '2', 'd', 'v', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '2', 'f', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'C', 'o', 'o', 'r', 'd', '2', 'f', 'v', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'M', 'e', 's', 'h', '1', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'P', 'o', 'i', 'n', 't', '1', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'M', 'e', 's', 'h', '2', '\0',
-    'g','l', 'E', 'v', 'a', 'l', 'P', 'o', 'i', 'n', 't', '2', '\0',
-    'g','l', 'A', 'l', 'p', 'h', 'a', 'F', 'u', 'n', 'c', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'F', 'u', 'n', 'c', '\0',
-    'g','l', 'L', 'o', 'g', 'i', 'c', 'O', 'p', '\0',
-    'g','l', 'S', 't', 'e', 'n', 'c', 'i', 'l', 'F', 'u', 'n', 'c', '\0',
-    'g','l', 'S', 't', 'e', 'n', 'c', 'i', 'l', 'O', 'p', '\0',
-    'g','l', 'D', 'e', 'p', 't', 'h', 'F', 'u', 'n', 'c', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'Z', 'o', 'o', 'm', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'r', 'a', 'n', 's', 'f', 'e', 'r', 'f', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'r', 'a', 'n', 's', 'f', 'e', 'r', 'i', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'S', 't', 'o', 'r', 'e', 'f', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'S', 't', 'o', 'r', 'e', 'i', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'M', 'a', 'p', 'f', 'v', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'M', 'a', 'p', 'u', 'i', 'v', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'M', 'a', 'p', 'u', 's', 'v', '\0',
-    'g','l', 'R', 'e', 'a', 'd', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'P', 'i', 'x', 'e', 'l', 's', '\0',
-    'g','l', 'R', 'e', 'a', 'd', 'P', 'i', 'x', 'e', 'l', 's', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'P', 'i', 'x', 'e', 'l', 's', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'o', 'o', 'l', 'e', 'a', 'n', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'l', 'i', 'p', 'P', 'l', 'a', 'n', 'e', '\0',
-    'g','l', 'G', 'e', 't', 'D', 'o', 'u', 'b', 'l', 'e', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'E', 'r', 'r', 'o', 'r', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'l', 'o', 'a', 't', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'I', 'n', 't', 'e', 'g', 'e', 'r', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'L', 'i', 'g', 'h', 't', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'L', 'i', 'g', 'h', 't', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'a', 'p', 'd', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'a', 'p', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'a', 'p', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'i', 'x', 'e', 'l', 'M', 'a', 'p', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'i', 'x', 'e', 'l', 'M', 'a', 'p', 'u', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'i', 'x', 'e', 'l', 'M', 'a', 'p', 'u', 's', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'o', 'l', 'y', 'g', 'o', 'n', 'S', 't', 'i', 'p', 'p', 'l', 'e', '\0',
-    'g','l', 'G', 'e', 't', 'S', 't', 'r', 'i', 'n', 'g', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'E', 'n', 'v', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'E', 'n', 'v', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'G', 'e', 'n', 'd', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'G', 'e', 'n', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'G', 'e', 'n', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'L', 'e', 'v', 'e', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'L', 'e', 'v', 'e', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'I', 's', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\0',
-    'g','l', 'I', 's', 'L', 'i', 's', 't', '\0',
-    'g','l', 'D', 'e', 'p', 't', 'h', 'R', 'a', 'n', 'g', 'e', '\0',
-    'g','l', 'F', 'r', 'u', 's', 't', 'u', 'm', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'I', 'd', 'e', 'n', 't', 'i', 't', 'y', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'M', 'a', 't', 'r', 'i', 'x', 'f', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'M', 'a', 't', 'r', 'i', 'x', 'd', '\0',
-    'g','l', 'M', 'a', 't', 'r', 'i', 'x', 'M', 'o', 'd', 'e', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'M', 'a', 't', 'r', 'i', 'x', 'f', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'M', 'a', 't', 'r', 'i', 'x', 'd', '\0',
-    'g','l', 'O', 'r', 't', 'h', 'o', '\0',
-    'g','l', 'P', 'o', 'p', 'M', 'a', 't', 'r', 'i', 'x', '\0',
-    'g','l', 'P', 'u', 's', 'h', 'M', 'a', 't', 'r', 'i', 'x', '\0',
-    'g','l', 'R', 'o', 't', 'a', 't', 'e', 'd', '\0',
-    'g','l', 'R', 'o', 't', 'a', 't', 'e', 'f', '\0',
-    'g','l', 'S', 'c', 'a', 'l', 'e', 'd', '\0',
-    'g','l', 'S', 'c', 'a', 'l', 'e', 'f', '\0',
-    'g','l', 'T', 'r', 'a', 'n', 's', 'l', 'a', 't', 'e', 'd', '\0',
-    'g','l', 'T', 'r', 'a', 'n', 's', 'l', 'a', 't', 'e', 'f', '\0',
-    'g','l', 'V', 'i', 'e', 'w', 'p', 'o', 'r', 't', '\0',
-    'g','l', 'A', 'r', 'r', 'a', 'y', 'E', 'l', 'e', 'm', 'e', 'n', 't', '\0',
-    'g','l', 'B', 'i', 'n', 'd', 'T', 'e', 'x', 't', 'u', 'r', 'e', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'D', 'i', 's', 'a', 'b', 'l', 'e', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'e', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'A', 'r', 'r', 'a', 'y', 's', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'E', 'l', 'e', 'm', 'e', 'n', 't', 's', '\0',
-    'g','l', 'E', 'd', 'g', 'e', 'F', 'l', 'a', 'g', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'E', 'n', 'a', 'b', 'l', 'e', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'e', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'u', 'b', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'u', 'b', 'v', '\0',
-    'g','l', 'I', 'n', 't', 'e', 'r', 'l', 'e', 'a', 'v', 'e', 'd', 'A', 'r', 'r', 'a', 'y', 's', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'P', 'o', 'l', 'y', 'g', 'o', 'n', 'O', 'f', 'f', 's', 'e', 't', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'A', 'r', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', 'R', 'e', 's', 'i', 'd', 'e', 'n', 't', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '1', 'D', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '2', 'D', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '1', 'D', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '2', 'D', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', '\0',
-    'g','l', 'G', 'e', 'n', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'v', '\0',
-    'g','l', 'I', 's', 'T', 'e', 'x', 't', 'u', 'r', 'e', '\0',
-    'g','l', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'i', 'z', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '1', 'D', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '2', 'D', '\0',
-    'g','l', 'P', 'o', 'p', 'C', 'l', 'i', 'e', 'n', 't', 'A', 't', 't', 'r', 'i', 'b', '\0',
-    'g','l', 'P', 'u', 's', 'h', 'C', 'l', 'i', 'e', 'n', 't', 'A', 't', 't', 'r', 'i', 'b', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'C', 'o', 'l', 'o', 'r', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'E', 'q', 'u', 'a', 't', 'i', 'o', 'n', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'R', 'a', 'n', 'g', 'e', 'E', 'l', 'e', 'm', 'e', 'n', 't', 's', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'S', 'u', 'b', 'T', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'l', 'o', 'r', 'S', 'u', 'b', 'T', 'a', 'b', 'l', 'e', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '1', 'D', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '2', 'D', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '1', 'D', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '2', 'D', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'S', 'e', 'p', 'a', 'r', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\0',
-    'g','l', 'S', 'e', 'p', 'a', 'r', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '2', 'D', '\0',
-    'g','l', 'G', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', '\0',
-    'g','l', 'G', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', '\0',
-    'g','l', 'M', 'i', 'n', 'm', 'a', 'x', '\0',
-    'g','l', 'R', 'e', 's', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', '\0',
-    'g','l', 'R', 'e', 's', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', '\0',
-    'g','l', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '3', 'D', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '3', 'D', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '3', 'D', '\0',
-    'g','l', 'A', 'c', 't', 'i', 'v', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 'A', 'R', 'B', '\0',
-    'g','l', 'C', 'l', 'i', 'e', 'n', 't', 'A', 'c', 't', 'i', 'v', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'i', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'i', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'i', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'i', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'S', 'a', 'm', 'p', 'l', 'e', 'C', 'o', 'v', 'e', 'r', 'a', 'g', 'e', 'A', 'R', 'B', '\0',
-    'g','l', '_', '_', 'u', 'n', 'u', 's', 'e', 'd', '4', '1', '3', '\0',
-    'g','l', 'P', 'o', 'l', 'y', 'g', 'o', 'n', 'O', 'f', 'f', 's', 'e', 't', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'e', 'x', 'F', 'i', 'l', 't', 'e', 'r', 'F', 'u', 'n', 'c', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'T', 'e', 'x', 'F', 'i', 'l', 't', 'e', 'r', 'F', 'u', 'n', 'c', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'G', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'S', 'e', 'p', 'a', 'r', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'S', 'G', 'I', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'i', 'x', 'e', 'l', 'T', 'e', 'x', 'G', 'e', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '4', 'D', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '4', 'D', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'A', 'r', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', 'R', 'e', 's', 'i', 'd', 'e', 'n', 't', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 'n', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'I', 's', 'T', 'e', 'x', 't', 'u', 'r', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'D', 'e', 't', 'a', 'i', 'l', 'T', 'e', 'x', 'F', 'u', 'n', 'c', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'G', 'e', 't', 'D', 'e', 't', 'a', 'i', 'l', 'T', 'e', 'x', 'F', 'u', 'n', 'c', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'S', 'h', 'a', 'r', 'p', 'e', 'n', 'T', 'e', 'x', 'F', 'u', 'n', 'c', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'G', 'e', 't', 'S', 'h', 'a', 'r', 'p', 'e', 'n', 'T', 'e', 'x', 'F', 'u', 'n', 'c', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'S', 'a', 'm', 'p', 'l', 'e', 'M', 'a', 's', 'k', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'S', 'a', 'm', 'p', 'l', 'e', 'P', 'a', 't', 't', 'e', 'r', 'n', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'E', 'd', 'g', 'e', 'F', 'l', 'a', 'g', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'N', 'o', 'r', 'm', 'a', 'l', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'p', 'r', 'i', 't', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'S', 'p', 'r', 'i', 't', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'S', 'p', 'r', 'i', 't', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'S', 'p', 'r', 'i', 't', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'E', 'X', 'T', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'P', 'o', 'l', 'l', 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'R', 'e', 'a', 'd', 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'S', 't', 'a', 'r', 't', 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'S', 't', 'o', 'p', 'I', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'm', 'e', 'Z', 'o', 'o', 'm', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'T', 'a', 'g', 'S', 'a', 'm', 'p', 'l', 'e', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'R', 'e', 'f', 'e', 'r', 'e', 'n', 'c', 'e', 'P', 'l', 'a', 'n', 'e', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'l', 'u', 's', 'h', 'R', 'a', 's', 't', 'e', 'r', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'G', 'e', 't', 'L', 'i', 's', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'G', 'e', 't', 'L', 'i', 's', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'L', 'i', 's', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'L', 'i', 's', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'L', 'i', 's', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'L', 'i', 's', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'C', 'o', 'l', 'o', 'r', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'f', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'i', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'f', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'i', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'M', 'o', 'd', 'e', 'l', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'f', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'i', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'L', 'i', 'g', 'h', 't', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'f', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'i', 'v', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'L', 'i', 'g', 'h', 't', 'E', 'n', 'v', 'i', 'S', 'G', 'I', 'X', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'W', 'e', 'i', 'g', 'h', 't', 'f', 'E', 'X', 'T', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'W', 'e', 'i', 'g', 'h', 't', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'F', 'l', 'u', 's', 'h', 'V', 'e', 'r', 't', 'e', 'x', 'A', 'r', 'r', 'a', 'y', 'R', 'a', 'n', 'g', 'e', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 'r', 'r', 'a', 'y', 'R', 'a', 'n', 'g', 'e', 'N', 'V', '\0',
-    'g','l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'N', 'V', '\0',
-    'g','l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'N', 'V', '\0',
-    'g','l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'I', 'n', 'p', 'u', 't', 'N', 'V', '\0',
-    'g','l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'O', 'u', 't', 'p', 'u', 't', 'N', 'V', '\0',
-    'g','l', 'F', 'i', 'n', 'a', 'l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'I', 'n', 'p', 'u', 't', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'I', 'n', 'p', 'u', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'I', 'n', 'p', 'u', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'O', 'u', 't', 'p', 'u', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'O', 'u', 't', 'p', 'u', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'i', 'n', 'a', 'l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'I', 'n', 'p', 'u', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'i', 'n', 'a', 'l', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'r', 'I', 'n', 'p', 'u', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'R', 'e', 's', 'i', 'z', 'e', 'B', 'u', 'f', 'f', 'e', 'r', 's', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'd', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'd', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'f', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'f', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'i', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'i', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 's', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 's', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'd', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'd', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'f', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'f', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'i', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'i', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 's', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 's', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 'd', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 'd', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 'f', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 'f', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 'i', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 'i', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 's', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '4', 's', 'v', 'M', 'E', 'S', 'A', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'F', 'u', 'n', 'c', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'M', 'a', 't', 'e', 'r', 'i', 'a', 'l', 'E', 'X', 'T', '\0',
-    'g','l', 'I', 'n', 'd', 'e', 'x', 'F', 'u', 'n', 'c', 'E', 'X', 'T', '\0',
-    'g','l', 'L', 'o', 'c', 'k', 'A', 'r', 'r', 'a', 'y', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'U', 'n', 'l', 'o', 'c', 'k', 'A', 'r', 'r', 'a', 'y', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'u', 'l', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'd', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'u', 'l', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'H', 'i', 'n', 't', 'P', 'G', 'I', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'f', 'E', 'X', 'T', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'd', 'E', 'X', 'T', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'd', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'T', 'b', 'u', 'f', 'f', 'e', 'r', 'M', 'a', 's', 'k', '3', 'D', 'F', 'X', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '3', 'D', 'A', 'R', 'B', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '2', 'D', 'A', 'R', 'B', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '1', 'D', 'A', 'R', 'B', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '3', 'D', 'A', 'R', 'B', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '2', 'D', 'A', 'R', 'B', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '1', 'D', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', 'A', 'R', 'B', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'b', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'b', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'd', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'd', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'f', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'i', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 's', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'b', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'b', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'i', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 's', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'A', 'r', 'e', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 's', 'R', 'e', 's', 'i', 'd', 'e', 'n', 't', 'N', 'V', '\0',
-    'g','l', 'B', 'i', 'n', 'd', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'V', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 's', 'N', 'V', '\0',
-    'g','l', 'E', 'x', 'e', 'c', 'u', 't', 'e', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 'n', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 's', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'S', 't', 'r', 'i', 'n', 'g', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'T', 'r', 'a', 'c', 'k', 'M', 'a', 't', 'r', 'i', 'x', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'v', 'N', 'V', '\0',
-    'g','l', 'I', 's', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'V', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '4', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '4', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'R', 'e', 'q', 'u', 'e', 's', 't', 'R', 'e', 's', 'i', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 's', 'N', 'V', '\0',
-    'g','l', 'T', 'r', 'a', 'c', 'k', 'M', 'a', 't', 'r', 'i', 'x', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'd', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'f', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 's', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'd', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'f', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 's', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'd', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'f', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 's', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'd', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'f', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 's', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'u', 'b', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'u', 'b', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '1', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '1', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '1', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '2', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '2', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '2', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '3', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '3', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '3', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '4', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '4', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '4', 's', 'v', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 's', '4', 'u', 'b', 'v', 'N', 'V', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'N', 'V', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'D', 'r', 'a', 'w', 'A', 'r', 'r', 'a', 'y', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'D', 'r', 'a', 'w', 'E', 'l', 'e', 'm', 'e', 'n', 't', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'A', 'c', 't', 'i', 'v', 'e', 'S', 't', 'e', 'n', 'c', 'i', 'l', 'F', 'a', 'c', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'F', 'e', 'n', 'c', 'e', 's', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 'n', 'F', 'e', 'n', 'c', 'e', 's', 'N', 'V', '\0',
-    'g','l', 'I', 's', 'F', 'e', 'n', 'c', 'e', 'N', 'V', '\0',
-    'g','l', 'T', 'e', 's', 't', 'F', 'e', 'n', 'c', 'e', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'F', 'e', 'n', 'c', 'e', 'i', 'v', 'N', 'V', '\0',
-    'g','l', 'F', 'i', 'n', 'i', 's', 'h', 'F', 'e', 'n', 'c', 'e', 'N', 'V', '\0',
-    'g','l', 'S', 'e', 't', 'F', 'e', 'n', 'c', 'e', 'N', 'V', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'b', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'u', 'b', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'u', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'u', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 'b', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 'u', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 'u', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'A', 'R', 'B', '\0',
-    'g','l', 'E', 'n', 'a', 'b', 'l', 'e', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'A', 'r', 'r', 'a', 'y', 'A', 'R', 'B', '\0',
-    'g','l', 'D', 'i', 's', 'a', 'b', 'l', 'e', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'A', 'r', 'r', 'a', 'y', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'S', 't', 'r', 'i', 'n', 'g', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'E', 'n', 'v', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'E', 'n', 'v', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'E', 'n', 'v', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'E', 'n', 'v', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'E', 'n', 'v', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'E', 'n', 'v', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'S', 't', 'r', 'i', 'n', 'g', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'a', 'm', 'e', 'd', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'a', 'm', 'e', 'd', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'a', 'm', 'e', 'd', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'a', 'm', 'e', 'd', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '4', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'a', 'm', 'e', 'd', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'N', 'V', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'N', 'a', 'm', 'e', 'd', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'd', 'v', 'N', 'V', '\0',
-    'g','l', 'B', 'i', 'n', 'd', 'B', 'u', 'f', 'f', 'e', 'r', 'A', 'R', 'B', '\0',
-    'g','l', 'B', 'u', 'f', 'f', 'e', 'r', 'D', 'a', 't', 'a', 'A', 'R', 'B', '\0',
-    'g','l', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'u', 'b', 'D', 'a', 't', 'a', 'A', 'R', 'B', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'B', 'u', 'f', 'f', 'e', 'r', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'u', 'b', 'D', 'a', 't', 'a', 'A', 'R', 'B', '\0',
-    'g','l', 'I', 's', 'B', 'u', 'f', 'f', 'e', 'r', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'a', 'p', 'B', 'u', 'f', 'f', 'e', 'r', 'A', 'R', 'B', '\0',
-    'g','l', 'U', 'n', 'm', 'a', 'p', 'B', 'u', 'f', 'f', 'e', 'r', 'A', 'R', 'B', '\0',
-    'g','l', 'D', 'e', 'p', 't', 'h', 'B', 'o', 'u', 'n', 'd', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 'n', 'Q', 'u', 'e', 'r', 'i', 'e', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'Q', 'u', 'e', 'r', 'i', 'e', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'I', 's', 'Q', 'u', 'e', 'r', 'y', 'A', 'R', 'B', '\0',
-    'g','l', 'B', 'e', 'g', 'i', 'n', 'Q', 'u', 'e', 'r', 'y', 'A', 'R', 'B', '\0',
-    'g','l', 'E', 'n', 'd', 'Q', 'u', 'e', 'r', 'y', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'Q', 'u', 'e', 'r', 'y', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'Q', 'u', 'e', 'r', 'y', 'O', 'b', 'j', 'e', 'c', 't', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'Q', 'u', 'e', 'r', 'y', 'O', 'b', 'j', 'e', 'c', 't', 'u', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'M', 'o', 'd', 'e', 'D', 'r', 'a', 'w', 'A', 'r', 'r', 'a', 'y', 's', 'I', 'B', 'M', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'M', 'o', 'd', 'e', 'D', 'r', 'a', 'w', 'E', 'l', 'e', 'm', 'e', 'n', 't', 's', 'I', 'B', 'M', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'E', 'q', 'u', 'a', 't', 'i', 'o', 'n', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'A', 'c', 't', 'i', 'v', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', '\0',
-    'g','l', 'C', 'l', 'i', 'e', 'n', 't', 'A', 'c', 't', 'i', 'v', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'd', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'd', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'f', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'f', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'i', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 'i', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 's', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '1', 's', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'd', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'd', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'f', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'f', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'i', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 'i', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 's', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '2', 's', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'd', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'd', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'f', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'f', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'i', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 'i', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 's', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '3', 's', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'd', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'd', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'f', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'f', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'i', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 'i', 'v', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 's', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'T', 'e', 'x', 'C', 'o', 'o', 'r', 'd', '4', 's', 'v', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'f', '\0',
-    'g','l', 'L', 'o', 'a', 'd', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'd', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'f', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'T', 'r', 'a', 'n', 's', 'p', 'o', 's', 'e', 'M', 'a', 't', 'r', 'i', 'x', 'd', '\0',
-    'g','l', 'S', 'a', 'm', 'p', 'l', 'e', 'C', 'o', 'v', 'e', 'r', 'a', 'g', 'e', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '3', 'D', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '2', 'D', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '1', 'D', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '3', 'D', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '2', 'D', '\0',
-    'g','l', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '1', 'D', '\0',
-    'g','l', 'G', 'e', 't', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', 'e', 'd', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'F', 'u', 'n', 'c', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'e', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'f', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'f', 'v', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'd', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'd', 'v', '\0',
-    'g','l', 'F', 'o', 'g', 'C', 'o', 'o', 'r', 'd', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'D', 'r', 'a', 'w', 'A', 'r', 'r', 'a', 'y', 's', '\0',
-    'g','l', 'M', 'u', 'l', 't', 'i', 'D', 'r', 'a', 'w', 'E', 'l', 'e', 'm', 'e', 'n', 't', 's', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'b', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'b', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'd', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'd', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'f', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'f', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'i', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'i', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 's', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 's', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'b', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'b', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'i', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 'i', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 's', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', '3', 'u', 's', 'v', '\0',
-    'g','l', 'S', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 'C', 'o', 'l', 'o', 'r', 'P', 'o', 'i', 'n', 't', 'e', 'r', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'd', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'd', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'f', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'f', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'i', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'i', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 's', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 's', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'd', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'd', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'f', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'f', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'i', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'i', 'v', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 's', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 's', 'v', '\0',
-    'g','l', 'B', 'i', 'n', 'd', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'B', 'u', 'f', 'f', 'e', 'r', 'D', 'a', 't', 'a', '\0',
-    'g','l', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'u', 'b', 'D', 'a', 't', 'a', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'B', 'u', 'f', 'f', 'e', 'r', 's', '\0',
-    'g','l', 'G', 'e', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 's', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'u', 'b', 'D', 'a', 't', 'a', '\0',
-    'g','l', 'I', 's', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'M', 'a', 'p', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'U', 'n', 'm', 'a', 'p', 'B', 'u', 'f', 'f', 'e', 'r', '\0',
-    'g','l', 'G', 'e', 'n', 'Q', 'u', 'e', 'r', 'i', 'e', 's', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'Q', 'u', 'e', 'r', 'i', 'e', 's', '\0',
-    'g','l', 'I', 's', 'Q', 'u', 'e', 'r', 'y', '\0',
-    'g','l', 'B', 'e', 'g', 'i', 'n', 'Q', 'u', 'e', 'r', 'y', '\0',
-    'g','l', 'E', 'n', 'd', 'Q', 'u', 'e', 'r', 'y', '\0',
-    'g','l', 'G', 'e', 't', 'Q', 'u', 'e', 'r', 'y', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'Q', 'u', 'e', 'r', 'y', 'O', 'b', 'j', 'e', 'c', 't', 'i', 'v', '\0',
-    'g','l', 'G', 'e', 't', 'Q', 'u', 'e', 'r', 'y', 'O', 'b', 'j', 'e', 'c', 't', 'u', 'i', 'v', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'i', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '2', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'i', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'W', 'i', 'n', 'd', 'o', 'w', 'P', 'o', 's', '3', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'f', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'd', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 'u', 'b', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '1', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '2', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '3', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 's', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', '4', 'N', 'u', 'b', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'B', 'i', 'n', 'd', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'A', 'R', 'B', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 'n', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 's', 'A', 'R', 'B', '\0',
-    'g','l', 'I', 's', 'P', 'r', 'o', 'g', 'r', 'a', 'm', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'd', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'f', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'i', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'G', 'e', 't', 'V', 'e', 'r', 't', 'e', 'x', 'A', 't', 't', 'r', 'i', 'b', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'v', 'A', 'R', 'B', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'C', 'o', 'l', 'o', 'r', 'E', 'X', 'T', '\0',
-    'g','l', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '3', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '3', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '1', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '2', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '1', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'I', 'm', 'a', 'g', 'e', '2', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '1', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '2', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'T', 'e', 'x', 'S', 'u', 'b', 'I', 'm', 'a', 'g', 'e', '3', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'E', 'X', 'T', '\0',
-    'g','l', 'M', 'i', 'n', 'm', 'a', 'x', 'E', 'X', 'T', '\0',
-    'g','l', 'R', 'e', 's', 'e', 't', 'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'E', 'X', 'T', '\0',
-    'g','l', 'R', 'e', 's', 'e', 't', 'M', 'i', 'n', 'm', 'a', 'x', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '1', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '2', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '1', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'n', 'v', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '2', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'e', 'p', 'a', 'r', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '2', 'D', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'S', 'G', 'I', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'i', 'v', 'S', 'G', 'I', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'S', 'G', 'I', '\0',
-    'g','l', 'B', 'i', 'n', 'd', 'T', 'e', 'x', 't', 'u', 'r', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'D', 'e', 'l', 'e', 't', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'i', 'z', 'e', 'T', 'e', 'x', 't', 'u', 'r', 'e', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'A', 'r', 'r', 'a', 'y', 'E', 'l', 'e', 'm', 'e', 'n', 't', 'E', 'X', 'T', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'A', 'r', 'r', 'a', 'y', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'G', 'e', 't', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'v', 'E', 'X', 'T', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'E', 'q', 'u', 'a', 't', 'i', 'o', 'n', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'S', 'u', 'b', 'T', 'a', 'b', 'l', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'p', 'y', 'C', 'o', 'l', 'o', 'r', 'S', 'u', 'b', 'T', 'a', 'b', 'l', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'C', 'o', 'l', 'o', 'r', 'T', 'a', 'b', 'l', 'e', 'E', 'X', 'T', '\0',
-    'g','l', 'D', 'r', 'a', 'w', 'R', 'a', 'n', 'g', 'e', 'E', 'l', 'e', 'm', 'e', 'n', 't', 's', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'a', 'm', 'p', 'l', 'e', 'M', 'a', 's', 'k', 'E', 'X', 'T', '\0',
-    'g','l', 'S', 'a', 'm', 'p', 'l', 'e', 'P', 'a', 't', 't', 'e', 'r', 'n', 'E', 'X', 'T', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'E', 'q', 'u', 'a', 't', 'i', 'o', 'n', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'e', 'A', 'T', 'I', '\0',
-    'g','l', 'B', 'l', 'e', 'n', 'd', 'F', 'u', 'n', 'c', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'e', 'I', 'N', 'G', 'R', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'S', 'G', 'I', 'S', '\0',
-    'g','l', 'P', 'o', 'i', 'n', 't', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'f', 'v', 'S', 'G', 'I', 'S', '\0',
-};
+static const char gl_string_table[] =
+    "glNewList\0"
+    "glEndList\0"
+    "glCallList\0"
+    "glCallLists\0"
+    "glDeleteLists\0"
+    "glGenLists\0"
+    "glListBase\0"
+    "glBegin\0"
+    "glBitmap\0"
+    "glColor3b\0"
+    "glColor3bv\0"
+    "glColor3d\0"
+    "glColor3dv\0"
+    "glColor3f\0"
+    "glColor3fv\0"
+    "glColor3i\0"
+    "glColor3iv\0"
+    "glColor3s\0"
+    "glColor3sv\0"
+    "glColor3ub\0"
+    "glColor3ubv\0"
+    "glColor3ui\0"
+    "glColor3uiv\0"
+    "glColor3us\0"
+    "glColor3usv\0"
+    "glColor4b\0"
+    "glColor4bv\0"
+    "glColor4d\0"
+    "glColor4dv\0"
+    "glColor4f\0"
+    "glColor4fv\0"
+    "glColor4i\0"
+    "glColor4iv\0"
+    "glColor4s\0"
+    "glColor4sv\0"
+    "glColor4ub\0"
+    "glColor4ubv\0"
+    "glColor4ui\0"
+    "glColor4uiv\0"
+    "glColor4us\0"
+    "glColor4usv\0"
+    "glEdgeFlag\0"
+    "glEdgeFlagv\0"
+    "glEnd\0"
+    "glIndexd\0"
+    "glIndexdv\0"
+    "glIndexf\0"
+    "glIndexfv\0"
+    "glIndexi\0"
+    "glIndexiv\0"
+    "glIndexs\0"
+    "glIndexsv\0"
+    "glNormal3b\0"
+    "glNormal3bv\0"
+    "glNormal3d\0"
+    "glNormal3dv\0"
+    "glNormal3f\0"
+    "glNormal3fv\0"
+    "glNormal3i\0"
+    "glNormal3iv\0"
+    "glNormal3s\0"
+    "glNormal3sv\0"
+    "glRasterPos2d\0"
+    "glRasterPos2dv\0"
+    "glRasterPos2f\0"
+    "glRasterPos2fv\0"
+    "glRasterPos2i\0"
+    "glRasterPos2iv\0"
+    "glRasterPos2s\0"
+    "glRasterPos2sv\0"
+    "glRasterPos3d\0"
+    "glRasterPos3dv\0"
+    "glRasterPos3f\0"
+    "glRasterPos3fv\0"
+    "glRasterPos3i\0"
+    "glRasterPos3iv\0"
+    "glRasterPos3s\0"
+    "glRasterPos3sv\0"
+    "glRasterPos4d\0"
+    "glRasterPos4dv\0"
+    "glRasterPos4f\0"
+    "glRasterPos4fv\0"
+    "glRasterPos4i\0"
+    "glRasterPos4iv\0"
+    "glRasterPos4s\0"
+    "glRasterPos4sv\0"
+    "glRectd\0"
+    "glRectdv\0"
+    "glRectf\0"
+    "glRectfv\0"
+    "glRecti\0"
+    "glRectiv\0"
+    "glRects\0"
+    "glRectsv\0"
+    "glTexCoord1d\0"
+    "glTexCoord1dv\0"
+    "glTexCoord1f\0"
+    "glTexCoord1fv\0"
+    "glTexCoord1i\0"
+    "glTexCoord1iv\0"
+    "glTexCoord1s\0"
+    "glTexCoord1sv\0"
+    "glTexCoord2d\0"
+    "glTexCoord2dv\0"
+    "glTexCoord2f\0"
+    "glTexCoord2fv\0"
+    "glTexCoord2i\0"
+    "glTexCoord2iv\0"
+    "glTexCoord2s\0"
+    "glTexCoord2sv\0"
+    "glTexCoord3d\0"
+    "glTexCoord3dv\0"
+    "glTexCoord3f\0"
+    "glTexCoord3fv\0"
+    "glTexCoord3i\0"
+    "glTexCoord3iv\0"
+    "glTexCoord3s\0"
+    "glTexCoord3sv\0"
+    "glTexCoord4d\0"
+    "glTexCoord4dv\0"
+    "glTexCoord4f\0"
+    "glTexCoord4fv\0"
+    "glTexCoord4i\0"
+    "glTexCoord4iv\0"
+    "glTexCoord4s\0"
+    "glTexCoord4sv\0"
+    "glVertex2d\0"
+    "glVertex2dv\0"
+    "glVertex2f\0"
+    "glVertex2fv\0"
+    "glVertex2i\0"
+    "glVertex2iv\0"
+    "glVertex2s\0"
+    "glVertex2sv\0"
+    "glVertex3d\0"
+    "glVertex3dv\0"
+    "glVertex3f\0"
+    "glVertex3fv\0"
+    "glVertex3i\0"
+    "glVertex3iv\0"
+    "glVertex3s\0"
+    "glVertex3sv\0"
+    "glVertex4d\0"
+    "glVertex4dv\0"
+    "glVertex4f\0"
+    "glVertex4fv\0"
+    "glVertex4i\0"
+    "glVertex4iv\0"
+    "glVertex4s\0"
+    "glVertex4sv\0"
+    "glClipPlane\0"
+    "glColorMaterial\0"
+    "glCullFace\0"
+    "glFogf\0"
+    "glFogfv\0"
+    "glFogi\0"
+    "glFogiv\0"
+    "glFrontFace\0"
+    "glHint\0"
+    "glLightf\0"
+    "glLightfv\0"
+    "glLighti\0"
+    "glLightiv\0"
+    "glLightModelf\0"
+    "glLightModelfv\0"
+    "glLightModeli\0"
+    "glLightModeliv\0"
+    "glLineStipple\0"
+    "glLineWidth\0"
+    "glMaterialf\0"
+    "glMaterialfv\0"
+    "glMateriali\0"
+    "glMaterialiv\0"
+    "glPointSize\0"
+    "glPolygonMode\0"
+    "glPolygonStipple\0"
+    "glScissor\0"
+    "glShadeModel\0"
+    "glTexParameterf\0"
+    "glTexParameterfv\0"
+    "glTexParameteri\0"
+    "glTexParameteriv\0"
+    "glTexImage1D\0"
+    "glTexImage2D\0"
+    "glTexEnvf\0"
+    "glTexEnvfv\0"
+    "glTexEnvi\0"
+    "glTexEnviv\0"
+    "glTexGend\0"
+    "glTexGendv\0"
+    "glTexGenf\0"
+    "glTexGenfv\0"
+    "glTexGeni\0"
+    "glTexGeniv\0"
+    "glFeedbackBuffer\0"
+    "glSelectBuffer\0"
+    "glRenderMode\0"
+    "glInitNames\0"
+    "glLoadName\0"
+    "glPassThrough\0"
+    "glPopName\0"
+    "glPushName\0"
+    "glDrawBuffer\0"
+    "glClear\0"
+    "glClearAccum\0"
+    "glClearIndex\0"
+    "glClearColor\0"
+    "glClearStencil\0"
+    "glClearDepth\0"
+    "glStencilMask\0"
+    "glColorMask\0"
+    "glDepthMask\0"
+    "glIndexMask\0"
+    "glAccum\0"
+    "glDisable\0"
+    "glEnable\0"
+    "glFinish\0"
+    "glFlush\0"
+    "glPopAttrib\0"
+    "glPushAttrib\0"
+    "glMap1d\0"
+    "glMap1f\0"
+    "glMap2d\0"
+    "glMap2f\0"
+    "glMapGrid1d\0"
+    "glMapGrid1f\0"
+    "glMapGrid2d\0"
+    "glMapGrid2f\0"
+    "glEvalCoord1d\0"
+    "glEvalCoord1dv\0"
+    "glEvalCoord1f\0"
+    "glEvalCoord1fv\0"
+    "glEvalCoord2d\0"
+    "glEvalCoord2dv\0"
+    "glEvalCoord2f\0"
+    "glEvalCoord2fv\0"
+    "glEvalMesh1\0"
+    "glEvalPoint1\0"
+    "glEvalMesh2\0"
+    "glEvalPoint2\0"
+    "glAlphaFunc\0"
+    "glBlendFunc\0"
+    "glLogicOp\0"
+    "glStencilFunc\0"
+    "glStencilOp\0"
+    "glDepthFunc\0"
+    "glPixelZoom\0"
+    "glPixelTransferf\0"
+    "glPixelTransferi\0"
+    "glPixelStoref\0"
+    "glPixelStorei\0"
+    "glPixelMapfv\0"
+    "glPixelMapuiv\0"
+    "glPixelMapusv\0"
+    "glReadBuffer\0"
+    "glCopyPixels\0"
+    "glReadPixels\0"
+    "glDrawPixels\0"
+    "glGetBooleanv\0"
+    "glGetClipPlane\0"
+    "glGetDoublev\0"
+    "glGetError\0"
+    "glGetFloatv\0"
+    "glGetIntegerv\0"
+    "glGetLightfv\0"
+    "glGetLightiv\0"
+    "glGetMapdv\0"
+    "glGetMapfv\0"
+    "glGetMapiv\0"
+    "glGetMaterialfv\0"
+    "glGetMaterialiv\0"
+    "glGetPixelMapfv\0"
+    "glGetPixelMapuiv\0"
+    "glGetPixelMapusv\0"
+    "glGetPolygonStipple\0"
+    "glGetString\0"
+    "glGetTexEnvfv\0"
+    "glGetTexEnviv\0"
+    "glGetTexGendv\0"
+    "glGetTexGenfv\0"
+    "glGetTexGeniv\0"
+    "glGetTexImage\0"
+    "glGetTexParameterfv\0"
+    "glGetTexParameteriv\0"
+    "glGetTexLevelParameterfv\0"
+    "glGetTexLevelParameteriv\0"
+    "glIsEnabled\0"
+    "glIsList\0"
+    "glDepthRange\0"
+    "glFrustum\0"
+    "glLoadIdentity\0"
+    "glLoadMatrixf\0"
+    "glLoadMatrixd\0"
+    "glMatrixMode\0"
+    "glMultMatrixf\0"
+    "glMultMatrixd\0"
+    "glOrtho\0"
+    "glPopMatrix\0"
+    "glPushMatrix\0"
+    "glRotated\0"
+    "glRotatef\0"
+    "glScaled\0"
+    "glScalef\0"
+    "glTranslated\0"
+    "glTranslatef\0"
+    "glViewport\0"
+    "glArrayElement\0"
+    "glBindTexture\0"
+    "glColorPointer\0"
+    "glDisableClientState\0"
+    "glDrawArrays\0"
+    "glDrawElements\0"
+    "glEdgeFlagPointer\0"
+    "glEnableClientState\0"
+    "glIndexPointer\0"
+    "glIndexub\0"
+    "glIndexubv\0"
+    "glInterleavedArrays\0"
+    "glNormalPointer\0"
+    "glPolygonOffset\0"
+    "glTexCoordPointer\0"
+    "glVertexPointer\0"
+    "glAreTexturesResident\0"
+    "glCopyTexImage1D\0"
+    "glCopyTexImage2D\0"
+    "glCopyTexSubImage1D\0"
+    "glCopyTexSubImage2D\0"
+    "glDeleteTextures\0"
+    "glGenTextures\0"
+    "glGetPointerv\0"
+    "glIsTexture\0"
+    "glPrioritizeTextures\0"
+    "glTexSubImage1D\0"
+    "glTexSubImage2D\0"
+    "glPopClientAttrib\0"
+    "glPushClientAttrib\0"
+    "glBlendColor\0"
+    "glBlendEquation\0"
+    "glDrawRangeElements\0"
+    "glColorTable\0"
+    "glColorTableParameterfv\0"
+    "glColorTableParameteriv\0"
+    "glCopyColorTable\0"
+    "glGetColorTable\0"
+    "glGetColorTableParameterfv\0"
+    "glGetColorTableParameteriv\0"
+    "glColorSubTable\0"
+    "glCopyColorSubTable\0"
+    "glConvolutionFilter1D\0"
+    "glConvolutionFilter2D\0"
+    "glConvolutionParameterf\0"
+    "glConvolutionParameterfv\0"
+    "glConvolutionParameteri\0"
+    "glConvolutionParameteriv\0"
+    "glCopyConvolutionFilter1D\0"
+    "glCopyConvolutionFilter2D\0"
+    "glGetConvolutionFilter\0"
+    "glGetConvolutionParameterfv\0"
+    "glGetConvolutionParameteriv\0"
+    "glGetSeparableFilter\0"
+    "glSeparableFilter2D\0"
+    "glGetHistogram\0"
+    "glGetHistogramParameterfv\0"
+    "glGetHistogramParameteriv\0"
+    "glGetMinmax\0"
+    "glGetMinmaxParameterfv\0"
+    "glGetMinmaxParameteriv\0"
+    "glHistogram\0"
+    "glMinmax\0"
+    "glResetHistogram\0"
+    "glResetMinmax\0"
+    "glTexImage3D\0"
+    "glTexSubImage3D\0"
+    "glCopyTexSubImage3D\0"
+    "glActiveTextureARB\0"
+    "glClientActiveTextureARB\0"
+    "glMultiTexCoord1dARB\0"
+    "glMultiTexCoord1dvARB\0"
+    "glMultiTexCoord1fARB\0"
+    "glMultiTexCoord1fvARB\0"
+    "glMultiTexCoord1iARB\0"
+    "glMultiTexCoord1ivARB\0"
+    "glMultiTexCoord1sARB\0"
+    "glMultiTexCoord1svARB\0"
+    "glMultiTexCoord2dARB\0"
+    "glMultiTexCoord2dvARB\0"
+    "glMultiTexCoord2fARB\0"
+    "glMultiTexCoord2fvARB\0"
+    "glMultiTexCoord2iARB\0"
+    "glMultiTexCoord2ivARB\0"
+    "glMultiTexCoord2sARB\0"
+    "glMultiTexCoord2svARB\0"
+    "glMultiTexCoord3dARB\0"
+    "glMultiTexCoord3dvARB\0"
+    "glMultiTexCoord3fARB\0"
+    "glMultiTexCoord3fvARB\0"
+    "glMultiTexCoord3iARB\0"
+    "glMultiTexCoord3ivARB\0"
+    "glMultiTexCoord3sARB\0"
+    "glMultiTexCoord3svARB\0"
+    "glMultiTexCoord4dARB\0"
+    "glMultiTexCoord4dvARB\0"
+    "glMultiTexCoord4fARB\0"
+    "glMultiTexCoord4fvARB\0"
+    "glMultiTexCoord4iARB\0"
+    "glMultiTexCoord4ivARB\0"
+    "glMultiTexCoord4sARB\0"
+    "glMultiTexCoord4svARB\0"
+    "glLoadTransposeMatrixfARB\0"
+    "glLoadTransposeMatrixdARB\0"
+    "glMultTransposeMatrixfARB\0"
+    "glMultTransposeMatrixdARB\0"
+    "glSampleCoverageARB\0"
+    "gl__unused413\0"
+    "glPolygonOffsetEXT\0"
+    "glGetTexFilterFuncSGIS\0"
+    "glTexFilterFuncSGIS\0"
+    "glGetHistogramEXT\0"
+    "glGetHistogramParameterfvEXT\0"
+    "glGetHistogramParameterivEXT\0"
+    "glGetMinmaxEXT\0"
+    "glGetMinmaxParameterfvEXT\0"
+    "glGetMinmaxParameterivEXT\0"
+    "glGetConvolutionFilterEXT\0"
+    "glGetConvolutionParameterfvEXT\0"
+    "glGetConvolutionParameterivEXT\0"
+    "glGetSeparableFilterEXT\0"
+    "glGetColorTableSGI\0"
+    "glGetColorTableParameterfvSGI\0"
+    "glGetColorTableParameterivSGI\0"
+    "glPixelTexGenSGIX\0"
+    "glPixelTexGenParameteriSGIS\0"
+    "glPixelTexGenParameterivSGIS\0"
+    "glPixelTexGenParameterfSGIS\0"
+    "glPixelTexGenParameterfvSGIS\0"
+    "glGetPixelTexGenParameterivSGIS\0"
+    "glGetPixelTexGenParameterfvSGIS\0"
+    "glTexImage4DSGIS\0"
+    "glTexSubImage4DSGIS\0"
+    "glAreTexturesResidentEXT\0"
+    "glGenTexturesEXT\0"
+    "glIsTextureEXT\0"
+    "glDetailTexFuncSGIS\0"
+    "glGetDetailTexFuncSGIS\0"
+    "glSharpenTexFuncSGIS\0"
+    "glGetSharpenTexFuncSGIS\0"
+    "glSampleMaskSGIS\0"
+    "glSamplePatternSGIS\0"
+    "glColorPointerEXT\0"
+    "glEdgeFlagPointerEXT\0"
+    "glIndexPointerEXT\0"
+    "glNormalPointerEXT\0"
+    "glTexCoordPointerEXT\0"
+    "glVertexPointerEXT\0"
+    "glSpriteParameterfSGIX\0"
+    "glSpriteParameterfvSGIX\0"
+    "glSpriteParameteriSGIX\0"
+    "glSpriteParameterivSGIX\0"
+    "glPointParameterfEXT\0"
+    "glPointParameterfvEXT\0"
+    "glGetInstrumentsSGIX\0"
+    "glInstrumentsBufferSGIX\0"
+    "glPollInstrumentsSGIX\0"
+    "glReadInstrumentsSGIX\0"
+    "glStartInstrumentsSGIX\0"
+    "glStopInstrumentsSGIX\0"
+    "glFrameZoomSGIX\0"
+    "glTagSampleBufferSGIX\0"
+    "glReferencePlaneSGIX\0"
+    "glFlushRasterSGIX\0"
+    "glGetListParameterfvSGIX\0"
+    "glGetListParameterivSGIX\0"
+    "glListParameterfSGIX\0"
+    "glListParameterfvSGIX\0"
+    "glListParameteriSGIX\0"
+    "glListParameterivSGIX\0"
+    "glFragmentColorMaterialSGIX\0"
+    "glFragmentLightfSGIX\0"
+    "glFragmentLightfvSGIX\0"
+    "glFragmentLightiSGIX\0"
+    "glFragmentLightivSGIX\0"
+    "glFragmentLightModelfSGIX\0"
+    "glFragmentLightModelfvSGIX\0"
+    "glFragmentLightModeliSGIX\0"
+    "glFragmentLightModelivSGIX\0"
+    "glFragmentMaterialfSGIX\0"
+    "glFragmentMaterialfvSGIX\0"
+    "glFragmentMaterialiSGIX\0"
+    "glFragmentMaterialivSGIX\0"
+    "glGetFragmentLightfvSGIX\0"
+    "glGetFragmentLightivSGIX\0"
+    "glGetFragmentMaterialfvSGIX\0"
+    "glGetFragmentMaterialivSGIX\0"
+    "glLightEnviSGIX\0"
+    "glVertexWeightfEXT\0"
+    "glVertexWeightfvEXT\0"
+    "glVertexWeightPointerEXT\0"
+    "glFlushVertexArrayRangeNV\0"
+    "glVertexArrayRangeNV\0"
+    "glCombinerParameterfvNV\0"
+    "glCombinerParameterfNV\0"
+    "glCombinerParameterivNV\0"
+    "glCombinerParameteriNV\0"
+    "glCombinerInputNV\0"
+    "glCombinerOutputNV\0"
+    "glFinalCombinerInputNV\0"
+    "glGetCombinerInputParameterfvNV\0"
+    "glGetCombinerInputParameterivNV\0"
+    "glGetCombinerOutputParameterfvNV\0"
+    "glGetCombinerOutputParameterivNV\0"
+    "glGetFinalCombinerInputParameterfvNV\0"
+    "glGetFinalCombinerInputParameterivNV\0"
+    "glResizeBuffersMESA\0"
+    "glWindowPos2dMESA\0"
+    "glWindowPos2dvMESA\0"
+    "glWindowPos2fMESA\0"
+    "glWindowPos2fvMESA\0"
+    "glWindowPos2iMESA\0"
+    "glWindowPos2ivMESA\0"
+    "glWindowPos2sMESA\0"
+    "glWindowPos2svMESA\0"
+    "glWindowPos3dMESA\0"
+    "glWindowPos3dvMESA\0"
+    "glWindowPos3fMESA\0"
+    "glWindowPos3fvMESA\0"
+    "glWindowPos3iMESA\0"
+    "glWindowPos3ivMESA\0"
+    "glWindowPos3sMESA\0"
+    "glWindowPos3svMESA\0"
+    "glWindowPos4dMESA\0"
+    "glWindowPos4dvMESA\0"
+    "glWindowPos4fMESA\0"
+    "glWindowPos4fvMESA\0"
+    "glWindowPos4iMESA\0"
+    "glWindowPos4ivMESA\0"
+    "glWindowPos4sMESA\0"
+    "glWindowPos4svMESA\0"
+    "glBlendFuncSeparateEXT\0"
+    "glIndexMaterialEXT\0"
+    "glIndexFuncEXT\0"
+    "glLockArraysEXT\0"
+    "glUnlockArraysEXT\0"
+    "glCullParameterdvEXT\0"
+    "glCullParameterfvEXT\0"
+    "glHintPGI\0"
+    "glFogCoordfEXT\0"
+    "glFogCoordfvEXT\0"
+    "glFogCoorddEXT\0"
+    "glFogCoorddvEXT\0"
+    "glFogCoordPointerEXT\0"
+    "glGetColorTableEXT\0"
+    "glGetColorTableParameterivEXT\0"
+    "glGetColorTableParameterfvEXT\0"
+    "glTbufferMask3DFX\0"
+    "glCompressedTexImage3DARB\0"
+    "glCompressedTexImage2DARB\0"
+    "glCompressedTexImage1DARB\0"
+    "glCompressedTexSubImage3DARB\0"
+    "glCompressedTexSubImage2DARB\0"
+    "glCompressedTexSubImage1DARB\0"
+    "glGetCompressedTexImageARB\0"
+    "glSecondaryColor3bEXT\0"
+    "glSecondaryColor3bvEXT\0"
+    "glSecondaryColor3dEXT\0"
+    "glSecondaryColor3dvEXT\0"
+    "glSecondaryColor3fEXT\0"
+    "glSecondaryColor3fvEXT\0"
+    "glSecondaryColor3iEXT\0"
+    "glSecondaryColor3ivEXT\0"
+    "glSecondaryColor3sEXT\0"
+    "glSecondaryColor3svEXT\0"
+    "glSecondaryColor3ubEXT\0"
+    "glSecondaryColor3ubvEXT\0"
+    "glSecondaryColor3uiEXT\0"
+    "glSecondaryColor3uivEXT\0"
+    "glSecondaryColor3usEXT\0"
+    "glSecondaryColor3usvEXT\0"
+    "glSecondaryColorPointerEXT\0"
+    "glAreProgramsResidentNV\0"
+    "glBindProgramNV\0"
+    "glDeleteProgramsNV\0"
+    "glExecuteProgramNV\0"
+    "glGenProgramsNV\0"
+    "glGetProgramParameterdvNV\0"
+    "glGetProgramParameterfvNV\0"
+    "glGetProgramivNV\0"
+    "glGetProgramStringNV\0"
+    "glGetTrackMatrixivNV\0"
+    "glGetVertexAttribdvNV\0"
+    "glGetVertexAttribfvNV\0"
+    "glGetVertexAttribivNV\0"
+    "glGetVertexAttribPointervNV\0"
+    "glIsProgramNV\0"
+    "glLoadProgramNV\0"
+    "glProgramParameter4dNV\0"
+    "glProgramParameter4dvNV\0"
+    "glProgramParameter4fNV\0"
+    "glProgramParameter4fvNV\0"
+    "glProgramParameters4dvNV\0"
+    "glProgramParameters4fvNV\0"
+    "glRequestResidentProgramsNV\0"
+    "glTrackMatrixNV\0"
+    "glVertexAttribPointerNV\0"
+    "glVertexAttrib1dNV\0"
+    "glVertexAttrib1dvNV\0"
+    "glVertexAttrib1fNV\0"
+    "glVertexAttrib1fvNV\0"
+    "glVertexAttrib1sNV\0"
+    "glVertexAttrib1svNV\0"
+    "glVertexAttrib2dNV\0"
+    "glVertexAttrib2dvNV\0"
+    "glVertexAttrib2fNV\0"
+    "glVertexAttrib2fvNV\0"
+    "glVertexAttrib2sNV\0"
+    "glVertexAttrib2svNV\0"
+    "glVertexAttrib3dNV\0"
+    "glVertexAttrib3dvNV\0"
+    "glVertexAttrib3fNV\0"
+    "glVertexAttrib3fvNV\0"
+    "glVertexAttrib3sNV\0"
+    "glVertexAttrib3svNV\0"
+    "glVertexAttrib4dNV\0"
+    "glVertexAttrib4dvNV\0"
+    "glVertexAttrib4fNV\0"
+    "glVertexAttrib4fvNV\0"
+    "glVertexAttrib4sNV\0"
+    "glVertexAttrib4svNV\0"
+    "glVertexAttrib4ubNV\0"
+    "glVertexAttrib4ubvNV\0"
+    "glVertexAttribs1dvNV\0"
+    "glVertexAttribs1fvNV\0"
+    "glVertexAttribs1svNV\0"
+    "glVertexAttribs2dvNV\0"
+    "glVertexAttribs2fvNV\0"
+    "glVertexAttribs2svNV\0"
+    "glVertexAttribs3dvNV\0"
+    "glVertexAttribs3fvNV\0"
+    "glVertexAttribs3svNV\0"
+    "glVertexAttribs4dvNV\0"
+    "glVertexAttribs4fvNV\0"
+    "glVertexAttribs4svNV\0"
+    "glVertexAttribs4ubvNV\0"
+    "glPointParameteriNV\0"
+    "glPointParameterivNV\0"
+    "glMultiDrawArraysEXT\0"
+    "glMultiDrawElementsEXT\0"
+    "glActiveStencilFaceEXT\0"
+    "glDeleteFencesNV\0"
+    "glGenFencesNV\0"
+    "glIsFenceNV\0"
+    "glTestFenceNV\0"
+    "glGetFenceivNV\0"
+    "glFinishFenceNV\0"
+    "glSetFenceNV\0"
+    "glVertexAttrib4bvARB\0"
+    "glVertexAttrib4ivARB\0"
+    "glVertexAttrib4ubvARB\0"
+    "glVertexAttrib4usvARB\0"
+    "glVertexAttrib4uivARB\0"
+    "glVertexAttrib4NbvARB\0"
+    "glVertexAttrib4NsvARB\0"
+    "glVertexAttrib4NivARB\0"
+    "glVertexAttrib4NusvARB\0"
+    "glVertexAttrib4NuivARB\0"
+    "glVertexAttribPointerARB\0"
+    "glEnableVertexAttribArrayARB\0"
+    "glDisableVertexAttribArrayARB\0"
+    "glProgramStringARB\0"
+    "glProgramEnvParameter4dARB\0"
+    "glProgramEnvParameter4dvARB\0"
+    "glProgramEnvParameter4fARB\0"
+    "glProgramEnvParameter4fvARB\0"
+    "glProgramLocalParameter4dARB\0"
+    "glProgramLocalParameter4dvARB\0"
+    "glProgramLocalParameter4fARB\0"
+    "glProgramLocalParameter4fvARB\0"
+    "glGetProgramEnvParameterdvARB\0"
+    "glGetProgramEnvParameterfvARB\0"
+    "glGetProgramLocalParameterdvARB\0"
+    "glGetProgramLocalParameterfvARB\0"
+    "glGetProgramivARB\0"
+    "glGetProgramStringARB\0"
+    "glProgramNamedParameter4fNV\0"
+    "glProgramNamedParameter4dNV\0"
+    "glProgramNamedParameter4fvNV\0"
+    "glProgramNamedParameter4dvNV\0"
+    "glGetProgramNamedParameterfvNV\0"
+    "glGetProgramNamedParameterdvNV\0"
+    "glBindBufferARB\0"
+    "glBufferDataARB\0"
+    "glBufferSubDataARB\0"
+    "glDeleteBuffersARB\0"
+    "glGenBuffersARB\0"
+    "glGetBufferParameterivARB\0"
+    "glGetBufferPointervARB\0"
+    "glGetBufferSubDataARB\0"
+    "glIsBufferARB\0"
+    "glMapBufferARB\0"
+    "glUnmapBufferARB\0"
+    "glDepthBoundsEXT\0"
+    "glGenQueriesARB\0"
+    "glDeleteQueriesARB\0"
+    "glIsQueryARB\0"
+    "glBeginQueryARB\0"
+    "glEndQueryARB\0"
+    "glGetQueryivARB\0"
+    "glGetQueryObjectivARB\0"
+    "glGetQueryObjectuivARB\0"
+    "glMultiModeDrawArraysIBM\0"
+    "glMultiModeDrawElementsIBM\0"
+    "glBlendEquationSeparateEXT\0"
+    "glActiveTexture\0"
+    "glClientActiveTexture\0"
+    "glMultiTexCoord1d\0"
+    "glMultiTexCoord1dv\0"
+    "glMultiTexCoord1f\0"
+    "glMultiTexCoord1fv\0"
+    "glMultiTexCoord1i\0"
+    "glMultiTexCoord1iv\0"
+    "glMultiTexCoord1s\0"
+    "glMultiTexCoord1sv\0"
+    "glMultiTexCoord2d\0"
+    "glMultiTexCoord2dv\0"
+    "glMultiTexCoord2f\0"
+    "glMultiTexCoord2fv\0"
+    "glMultiTexCoord2i\0"
+    "glMultiTexCoord2iv\0"
+    "glMultiTexCoord2s\0"
+    "glMultiTexCoord2sv\0"
+    "glMultiTexCoord3d\0"
+    "glMultiTexCoord3dv\0"
+    "glMultiTexCoord3f\0"
+    "glMultiTexCoord3fv\0"
+    "glMultiTexCoord3i\0"
+    "glMultiTexCoord3iv\0"
+    "glMultiTexCoord3s\0"
+    "glMultiTexCoord3sv\0"
+    "glMultiTexCoord4d\0"
+    "glMultiTexCoord4dv\0"
+    "glMultiTexCoord4f\0"
+    "glMultiTexCoord4fv\0"
+    "glMultiTexCoord4i\0"
+    "glMultiTexCoord4iv\0"
+    "glMultiTexCoord4s\0"
+    "glMultiTexCoord4sv\0"
+    "glLoadTransposeMatrixf\0"
+    "glLoadTransposeMatrixd\0"
+    "glMultTransposeMatrixf\0"
+    "glMultTransposeMatrixd\0"
+    "glSampleCoverage\0"
+    "glCompressedTexImage3D\0"
+    "glCompressedTexImage2D\0"
+    "glCompressedTexImage1D\0"
+    "glCompressedTexSubImage3D\0"
+    "glCompressedTexSubImage2D\0"
+    "glCompressedTexSubImage1D\0"
+    "glGetCompressedTexImage\0"
+    "glBlendFuncSeparate\0"
+    "glFogCoordf\0"
+    "glFogCoordfv\0"
+    "glFogCoordd\0"
+    "glFogCoorddv\0"
+    "glFogCoordPointer\0"
+    "glMultiDrawArrays\0"
+    "glMultiDrawElements\0"
+    "glPointParameterf\0"
+    "glPointParameterfv\0"
+    "glPointParameteri\0"
+    "glPointParameteriv\0"
+    "glSecondaryColor3b\0"
+    "glSecondaryColor3bv\0"
+    "glSecondaryColor3d\0"
+    "glSecondaryColor3dv\0"
+    "glSecondaryColor3f\0"
+    "glSecondaryColor3fv\0"
+    "glSecondaryColor3i\0"
+    "glSecondaryColor3iv\0"
+    "glSecondaryColor3s\0"
+    "glSecondaryColor3sv\0"
+    "glSecondaryColor3ub\0"
+    "glSecondaryColor3ubv\0"
+    "glSecondaryColor3ui\0"
+    "glSecondaryColor3uiv\0"
+    "glSecondaryColor3us\0"
+    "glSecondaryColor3usv\0"
+    "glSecondaryColorPointer\0"
+    "glWindowPos2d\0"
+    "glWindowPos2dv\0"
+    "glWindowPos2f\0"
+    "glWindowPos2fv\0"
+    "glWindowPos2i\0"
+    "glWindowPos2iv\0"
+    "glWindowPos2s\0"
+    "glWindowPos2sv\0"
+    "glWindowPos3d\0"
+    "glWindowPos3dv\0"
+    "glWindowPos3f\0"
+    "glWindowPos3fv\0"
+    "glWindowPos3i\0"
+    "glWindowPos3iv\0"
+    "glWindowPos3s\0"
+    "glWindowPos3sv\0"
+    "glBindBuffer\0"
+    "glBufferData\0"
+    "glBufferSubData\0"
+    "glDeleteBuffers\0"
+    "glGenBuffers\0"
+    "glGetBufferParameteriv\0"
+    "glGetBufferPointerv\0"
+    "glGetBufferSubData\0"
+    "glIsBuffer\0"
+    "glMapBuffer\0"
+    "glUnmapBuffer\0"
+    "glGenQueries\0"
+    "glDeleteQueries\0"
+    "glIsQuery\0"
+    "glBeginQuery\0"
+    "glEndQuery\0"
+    "glGetQueryiv\0"
+    "glGetQueryObjectiv\0"
+    "glGetQueryObjectuiv\0"
+    "glPointParameterfARB\0"
+    "glPointParameterfvARB\0"
+    "glWindowPos2dARB\0"
+    "glWindowPos2fARB\0"
+    "glWindowPos2iARB\0"
+    "glWindowPos2sARB\0"
+    "glWindowPos2dvARB\0"
+    "glWindowPos2fvARB\0"
+    "glWindowPos2ivARB\0"
+    "glWindowPos2svARB\0"
+    "glWindowPos3dARB\0"
+    "glWindowPos3fARB\0"
+    "glWindowPos3iARB\0"
+    "glWindowPos3sARB\0"
+    "glWindowPos3dvARB\0"
+    "glWindowPos3fvARB\0"
+    "glWindowPos3ivARB\0"
+    "glWindowPos3svARB\0"
+    "glVertexAttrib1sARB\0"
+    "glVertexAttrib1fARB\0"
+    "glVertexAttrib1dARB\0"
+    "glVertexAttrib2sARB\0"
+    "glVertexAttrib2fARB\0"
+    "glVertexAttrib2dARB\0"
+    "glVertexAttrib3sARB\0"
+    "glVertexAttrib3fARB\0"
+    "glVertexAttrib3dARB\0"
+    "glVertexAttrib4sARB\0"
+    "glVertexAttrib4fARB\0"
+    "glVertexAttrib4dARB\0"
+    "glVertexAttrib4NubARB\0"
+    "glVertexAttrib1svARB\0"
+    "glVertexAttrib1fvARB\0"
+    "glVertexAttrib1dvARB\0"
+    "glVertexAttrib2svARB\0"
+    "glVertexAttrib2fvARB\0"
+    "glVertexAttrib2dvARB\0"
+    "glVertexAttrib3svARB\0"
+    "glVertexAttrib3fvARB\0"
+    "glVertexAttrib3dvARB\0"
+    "glVertexAttrib4svARB\0"
+    "glVertexAttrib4fvARB\0"
+    "glVertexAttrib4dvARB\0"
+    "glVertexAttrib4NubvARB\0"
+    "glBindProgramARB\0"
+    "glDeleteProgramsARB\0"
+    "glGenProgramsARB\0"
+    "glIsProgramARB\0"
+    "glGetVertexAttribdvARB\0"
+    "glGetVertexAttribfvARB\0"
+    "glGetVertexAttribivARB\0"
+    "glGetVertexAttribPointervARB\0"
+    "glBlendColorEXT\0"
+    "glTexImage3DEXT\0"
+    "glTexSubImage3DEXT\0"
+    "glTexSubImage1DEXT\0"
+    "glTexSubImage2DEXT\0"
+    "glCopyTexImage1DEXT\0"
+    "glCopyTexImage2DEXT\0"
+    "glCopyTexSubImage1DEXT\0"
+    "glCopyTexSubImage2DEXT\0"
+    "glCopyTexSubImage3DEXT\0"
+    "glHistogramEXT\0"
+    "glMinmaxEXT\0"
+    "glResetHistogramEXT\0"
+    "glResetMinmaxEXT\0"
+    "glConvolutionFilter1DEXT\0"
+    "glConvolutionFilter2DEXT\0"
+    "glConvolutionParameterfEXT\0"
+    "glConvolutionParameterfvEXT\0"
+    "glConvolutionParameteriEXT\0"
+    "glConvolutionParameterivEXT\0"
+    "glCopyConvolutionFilter1DEXT\0"
+    "glCopyConvolutionFilter2DEXT\0"
+    "glSeparableFilter2DEXT\0"
+    "glColorTableSGI\0"
+    "glColorTableParameterfvSGI\0"
+    "glColorTableParameterivSGI\0"
+    "glCopyColorTableSGI\0"
+    "glBindTextureEXT\0"
+    "glDeleteTexturesEXT\0"
+    "glPrioritizeTexturesEXT\0"
+    "glArrayElementEXT\0"
+    "glDrawArraysEXT\0"
+    "glGetPointervEXT\0"
+    "glBlendEquationEXT\0"
+    "glColorSubTableEXT\0"
+    "glCopyColorSubTableEXT\0"
+    "glColorTableEXT\0"
+    "glDrawRangeElementsEXT\0"
+    "glSampleMaskEXT\0"
+    "glSamplePatternEXT\0"
+    "glBlendEquationSeparateATI\0"
+    "glBlendFuncSeparateINGR\0"
+    "glPointParameterfSGIS\0"
+    "glPointParameterfvSGIS\0"
+    ;
 
 static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(     0, glNewList, _gloffset_NewList ),
@@ -1883,7 +1883,7 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 16324, glBlendFuncSeparateINGR, _gloffset_BlendFuncSeparateEXT ),
     NAME_FUNC_OFFSET( 16348, glPointParameterfSGIS, _gloffset_PointParameterfEXT ),
     NAME_FUNC_OFFSET( 16370, glPointParameterfvSGIS, _gloffset_PointParameterfvEXT ),
-    NAME_FUNC_OFFSET( -1, NULL, -1 )
+    NAME_FUNC_OFFSET( -1, NULL, 0 )
 };
 
 #undef NAME_FUNC_OFFSET
diff --git a/extras/Mesa/src/mesa/glapi/glsparcasm.py b/extras/Mesa/src/mesa/glapi/glsparcasm.py
index 35d90f133..7d17c933e 100755
--- a/extras/Mesa/src/mesa/glapi/glsparcasm.py
+++ b/extras/Mesa/src/mesa/glapi/glsparcasm.py
@@ -109,7 +109,7 @@ def EmitFunction(name, returnType, argTypeList, argNameList, alias, offset):
 	print '.globl gl%s' % (name)
 	print '.type gl%s,#function' % (name)
 	print 'gl%s:' % (name)
-	print '#if defined(__sparc_v9__) && !defined(__linux__)'
+	print '#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))'
 	print '\tsethi\t%hi(0x00000000), %g2'
 	print '\tsethi\t%hi(0x00000000), %g1'
 	print '\tor\t%g2, %lo(0x00000000), %g2'
diff --git a/extras/Mesa/src/mesa/glapi/glthread.h b/extras/Mesa/src/mesa/glapi/glthread.h
index 6dc136e97..6431d24ee 100644
--- a/extras/Mesa/src/mesa/glapi/glthread.h
+++ b/extras/Mesa/src/mesa/glapi/glthread.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.2.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -194,7 +193,7 @@ typedef CRITICAL_SECTION _glthread_Mutex;
  * We wrap it again for GL.
  */
 #ifdef XTHREADS
-#include "Xthreads.h"
+#include <X11/Xthreads.h>
 
 typedef struct {
    xthread_key_t key;
diff --git a/extras/Mesa/src/mesa/main/api_arrayelt.c b/extras/Mesa/src/mesa/main/api_arrayelt.c
index a127fe04a..626c92eca 100644
--- a/extras/Mesa/src/mesa/main/api_arrayelt.c
+++ b/extras/Mesa/src/mesa/main/api_arrayelt.c
@@ -64,79 +64,274 @@ typedef struct {
  */
 #define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )
 
+static void GLAPIENTRY Color3bv(const GLbyte *v)
+{
+   GL_CALL(Color3bv)(v);
+}
+
+static void GLAPIENTRY Color3ubv(const GLubyte *v)
+{
+   GL_CALL(Color3ubv)(v);
+}
+
+static void GLAPIENTRY Color3sv(const GLshort *v)
+{
+   GL_CALL(Color3sv)(v);
+}
+
+static void GLAPIENTRY Color3usv(const GLushort *v)
+{
+   GL_CALL(Color3usv)(v);
+}
+
+static void GLAPIENTRY Color3iv(const GLint *v)
+{
+   GL_CALL(Color3iv)(v);
+}
+
+static void GLAPIENTRY Color3uiv(const GLuint *v)
+{
+   GL_CALL(Color3uiv)(v);
+}
+
+static void GLAPIENTRY Color3fv(const GLfloat *v)
+{
+   GL_CALL(Color3fv)(v);
+}
+
+static void GLAPIENTRY Color3dv(const GLdouble *v)
+{
+   GL_CALL(Color3dv)(v);
+}
+
+static void GLAPIENTRY Color4bv(const GLbyte *v)
+{
+   GL_CALL(Color4bv)(v);
+}
+
+static void GLAPIENTRY Color4ubv(const GLubyte *v)
+{
+   GL_CALL(Color4ubv)(v);
+}
+
+static void GLAPIENTRY Color4sv(const GLshort *v)
+{
+   GL_CALL(Color4sv)(v);
+}
 
-static array_func ColorFuncs[2][8] = {
-   { (array_func)glColor3bv,
-     (array_func)glColor3ubv,
-     (array_func)glColor3sv,
-     (array_func)glColor3usv,
-     (array_func)glColor3iv,
-     (array_func)glColor3uiv,
-     (array_func)glColor3fv,
-     (array_func)glColor3dv },
-
-   { (array_func)glColor4bv,
-     (array_func)glColor4ubv,
-     (array_func)glColor4sv,
-     (array_func)glColor4usv,
-     (array_func)glColor4iv,
-     (array_func)glColor4uiv,
-     (array_func)glColor4fv,
-     (array_func)glColor4dv }
+static void GLAPIENTRY Color4usv(const GLushort *v)
+{
+   GL_CALL(Color4usv)(v);
+}
+
+static void GLAPIENTRY Color4iv(const GLint *v)
+{
+   GL_CALL(Color4iv)(v);
+}
+
+static void GLAPIENTRY Color4uiv(const GLuint *v)
+{
+   GL_CALL(Color4uiv)(v);
+}
+
+static void GLAPIENTRY Color4fv(const GLfloat *v)
+{
+   GL_CALL(Color4fv)(v);
+}
+
+static void GLAPIENTRY Color4dv(const GLdouble *v)
+{
+   GL_CALL(Color4dv)(v);
+}
+
+static const array_func ColorFuncs[2][8] = {
+   {
+      (array_func) Color3bv,
+      (array_func) Color3ubv,
+      (array_func) Color3sv,
+      (array_func) Color3usv,
+      (array_func) Color3iv,
+      (array_func) Color3uiv,
+      (array_func) Color3fv,
+      (array_func) Color3dv,
+   },
+   {
+      (array_func) Color4bv,
+      (array_func) Color4ubv,
+      (array_func) Color4sv,
+      (array_func) Color4usv,
+      (array_func) Color4iv,
+      (array_func) Color4uiv,
+      (array_func) Color4fv,
+      (array_func) Color4dv,
+   },
 };
 
-static array_func VertexFuncs[3][8] = {
-   { 0,
-     0,
-     (array_func)glVertex2sv,
-     0,
-     (array_func)glVertex2iv,
-     0,
-     (array_func)glVertex2fv,
-     (array_func)glVertex2dv },
-
-   { 0,
-     0,
-     (array_func)glVertex3sv,
-     0,
-     (array_func)glVertex3iv,
-     0,
-     (array_func)glVertex3fv,
-     (array_func)glVertex3dv },
-
-   { 0,
-     0,
-     (array_func)glVertex4sv,
-     0,
-     (array_func)glVertex4iv,
-     0,
-     (array_func)glVertex4fv,
-     (array_func)glVertex4dv }
+static void GLAPIENTRY Vertex2sv(const GLshort *v)
+{
+   GL_CALL(Vertex2sv)(v);
+}
+
+static void GLAPIENTRY Vertex2iv(const GLint *v)
+{
+   GL_CALL(Vertex2iv)(v);
+}
+
+static void GLAPIENTRY Vertex2fv(const GLfloat *v)
+{
+   GL_CALL(Vertex2fv)(v);
+}
+
+static void GLAPIENTRY Vertex2dv(const GLdouble *v)
+{
+   GL_CALL(Vertex2dv)(v);
+}
+
+static void GLAPIENTRY Vertex3sv(const GLshort *v)
+{
+   GL_CALL(Vertex3sv)(v);
+}
+
+static void GLAPIENTRY Vertex3iv(const GLint *v)
+{
+   GL_CALL(Vertex3iv)(v);
+}
+
+static void GLAPIENTRY Vertex3fv(const GLfloat *v)
+{
+   GL_CALL(Vertex3fv)(v);
+}
+
+static void GLAPIENTRY Vertex3dv(const GLdouble *v)
+{
+   GL_CALL(Vertex3dv)(v);
+}
+
+static void GLAPIENTRY Vertex4sv(const GLshort *v)
+{
+   GL_CALL(Vertex4sv)(v);
+}
+
+static void GLAPIENTRY Vertex4iv(const GLint *v)
+{
+   GL_CALL(Vertex4iv)(v);
+}
+
+static void GLAPIENTRY Vertex4fv(const GLfloat *v)
+{
+   GL_CALL(Vertex4fv)(v);
+}
+
+static void GLAPIENTRY Vertex4dv(const GLdouble *v)
+{
+   GL_CALL(Vertex4dv)(v);
+}
+
+static const array_func VertexFuncs[3][8] = {
+   {
+      0,
+      0,
+      (array_func) Vertex2sv,
+      0,
+      (array_func) Vertex2iv,
+      0,
+      (array_func) Vertex2fv,
+      (array_func) Vertex2dv,
+   },
+   {
+      0,
+      0,
+      (array_func) Vertex3sv,
+      0,
+      (array_func) Vertex3iv,
+      0,
+      (array_func) Vertex3fv,
+      (array_func) Vertex3dv,
+   },
+   {
+      0,
+      0,
+      (array_func) Vertex4sv,
+      0,
+      (array_func) Vertex4iv,
+      0,
+      (array_func) Vertex4fv,
+      (array_func) Vertex4dv,
+   },
 };
 
-static array_func IndexFuncs[8] = {
+static void GLAPIENTRY Indexubv(const GLubyte *c)
+{
+   GL_CALL(Indexubv)(c);
+}
+
+static void GLAPIENTRY Indexsv(const GLshort *c)
+{
+   GL_CALL(Indexsv)(c);
+}
+
+static void GLAPIENTRY Indexiv(const GLint *c)
+{
+   GL_CALL(Indexiv)(c);
+}
+
+static void GLAPIENTRY Indexfv(const GLfloat *c)
+{
+   GL_CALL(Indexfv)(c);
+}
+
+static void GLAPIENTRY Indexdv(const GLdouble *c)
+{
+   GL_CALL(Indexdv)(c);
+}
+
+static const array_func IndexFuncs[8] = {
    0,
-   (array_func)glIndexubv,
-   (array_func)glIndexsv,
+   (array_func) Indexubv,
+   (array_func) Indexsv,
    0,
-   (array_func)glIndexiv,
+   (array_func) Indexiv,
    0,
-   (array_func)glIndexfv,
-   (array_func)glIndexdv
+   (array_func) Indexfv,
+   (array_func) Indexdv,
 };
 
-static array_func NormalFuncs[8] = {
-   (array_func)glNormal3bv,
+static void GLAPIENTRY Normal3bv(const GLbyte *v)
+{
+   GL_CALL(Normal3bv)(v);
+}
+
+static void GLAPIENTRY Normal3sv(const GLshort *v)
+{
+   GL_CALL(Normal3sv)(v);
+}
+
+static void GLAPIENTRY Normal3iv(const GLint *v)
+{
+   GL_CALL(Normal3iv)(v);
+}
+
+static void GLAPIENTRY Normal3fv(const GLfloat *v)
+{
+   GL_CALL(Normal3fv)(v);
+}
+
+static void GLAPIENTRY Normal3dv(const GLdouble *v)
+{
+   GL_CALL(Normal3dv)(v);
+}
+
+static const array_func NormalFuncs[8] = {
+   (array_func) Normal3bv,
    0,
-   (array_func)glNormal3sv,
+   (array_func) Normal3sv,
    0,
-   (array_func)glNormal3iv,
+   (array_func) Normal3iv,
    0,
-   (array_func)glNormal3fv,
-   (array_func)glNormal3dv,
+   (array_func) Normal3fv,
+   (array_func) Normal3dv,
 };
 
-
 /* Wrapper functions in case glSecondaryColor*EXT doesn't exist */
 static void GLAPIENTRY SecondaryColor3bvEXT(const GLbyte *c)
 {
@@ -178,7 +373,7 @@ static void GLAPIENTRY SecondaryColor3dvEXT(const GLdouble *c)
    GL_CALL(SecondaryColor3dvEXT)(c);
 }
 
-static array_func SecondaryColorFuncs[8] = {
+static const array_func SecondaryColorFuncs[8] = {
    (array_func) SecondaryColor3bvEXT,
    (array_func) SecondaryColor3ubvEXT,
    (array_func) SecondaryColor3svEXT,
@@ -201,7 +396,7 @@ static void GLAPIENTRY FogCoorddvEXT(const GLdouble *f)
    GL_CALL(FogCoorddvEXT)(f);
 }
 
-static array_func FogCoordFuncs[8] = {
+static const array_func FogCoordFuncs[8] = {
    0,
    0,
    0,
@@ -212,7 +407,6 @@ static array_func FogCoordFuncs[8] = {
    (array_func) FogCoorddvEXT
 };
 
-
 /**********************************************************************/
 
 /* GL_BYTE attributes */
@@ -549,7 +743,7 @@ static void GLAPIENTRY VertexAttrib4dv(GLuint index, const GLdouble *v)
 /*
  * Array [size][type] of VertexAttrib functions
  */
-static attrib_func AttribFuncs[2][4][8] = {
+static const attrib_func AttribFuncs[2][4][8] = {
    {
       /* non-normalized */
       {
@@ -646,6 +840,11 @@ static attrib_func AttribFuncs[2][4][8] = {
    }
 };
 
+static void GLAPIENTRY EdgeFlagv(const GLboolean *flag)
+{
+   GL_CALL(EdgeFlagv)(flag);
+}
+
 /**********************************************************************/
 
 
@@ -693,7 +892,7 @@ static void _ae_update_state( GLcontext *ctx )
    }
    if (ctx->Array.EdgeFlag.Enabled) {
       aa->array = &ctx->Array.EdgeFlag;
-      aa->func = (array_func) glEdgeFlagv;
+      aa->func = (array_func) EdgeFlagv;
       aa++;
    }
    if (ctx->Array.Normal.Enabled) {
diff --git a/extras/Mesa/src/mesa/main/api_loopback.c b/extras/Mesa/src/mesa/main/api_loopback.c
index 0c21302cc..3281caf3c 100644
--- a/extras/Mesa/src/mesa/main/api_loopback.c
+++ b/extras/Mesa/src/mesa/main/api_loopback.c
@@ -6,7 +6,7 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -1066,7 +1066,7 @@ loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
 static void GLAPIENTRY
 loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-   ATTRIB3(index, (GLfloat) x, y, z);
+   ATTRIB3(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
 }
 
 static void GLAPIENTRY
@@ -1139,7 +1139,7 @@ loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
 static void GLAPIENTRY
 loopback_VertexAttrib3svNV(GLuint index, const GLshort *v)
 {
-   ATTRIB2(index, (GLfloat) v[0], (GLfloat) v[1]);
+   ATTRIB3(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
 }
 
 static void GLAPIENTRY
diff --git a/extras/Mesa/src/mesa/main/bufferobj.c b/extras/Mesa/src/mesa/main/bufferobj.c
index 0d0e5f4bc..680ecf619 100644
--- a/extras/Mesa/src/mesa/main/bufferobj.c
+++ b/extras/Mesa/src/mesa/main/bufferobj.c
@@ -113,17 +113,17 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
    }
 
    bufObj = buffer_object_get_target( ctx, target, str );
-   if ( bufObj == NULL ) {
+   if (!bufObj || bufObj->Name == 0) {
       return NULL;
    }
 
-   if ( (GLuint)(offset + size) > bufObj->Size ) {
+   if ((GLuint) (offset + size) > bufObj->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
 		  "%s(size + offset > buffer size)", str);
       return NULL;
    }
 
-   if ( bufObj->Pointer != NULL ) {
+   if (bufObj->Pointer) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "%s", str);
       return NULL;
    }
@@ -241,12 +241,12 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
    (void) ctx; (void) target;
 
    new_data = _mesa_realloc( bufObj->Data, bufObj->Size, size );
-   if ( new_data != NULL ) {
+   if (new_data) {
       bufObj->Data = (GLubyte *) new_data;
       bufObj->Size = size;
       bufObj->Usage = usage;
 
-      if ( data != NULL ) {
+      if (data) {
 	 _mesa_memcpy( bufObj->Data, data, size );
       }
    }
@@ -278,8 +278,7 @@ _mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
 {
    (void) ctx; (void) target;
 
-   if ( (bufObj->Data != NULL)
-	&& ((GLuint)(size + offset) <= bufObj->Size) ) {
+   if (bufObj->Data && ((GLuint) (size + offset) <= bufObj->Size)) {
       _mesa_memcpy( (GLubyte *) bufObj->Data + offset, data, size );
    }
 }
@@ -310,8 +309,7 @@ _mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
 {
    (void) ctx; (void) target;
 
-   if ( (bufObj->Data != NULL)
-	&& ((GLuint)(size + offset) <= bufObj->Size) ) {
+   if (bufObj->Data && ((GLuint) (size + offset) <= bufObj->Size)) {
       _mesa_memcpy( data, (GLubyte *) bufObj->Data + offset, size );
    }
 }
@@ -443,13 +441,13 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" );
-   if ( (oldBufObj != NULL) && (oldBufObj->Name == buffer) )
+   if (oldBufObj && oldBufObj->Name == buffer)
       return;   /* rebinding the same buffer object- no change */
 
    /*
     * Get pointer to new buffer object (newBufObj)
     */
-   if ( buffer == 0 ) {
+   if (buffer == 0) {
       /* The spec says there's not a buffer object named 0, but we use
        * one internally because it simplifies things.
        */
@@ -490,10 +488,10 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
    }
 
    /* Pass BindBuffer call to device driver */
-   if ( (ctx->Driver.BindBuffer != NULL) && (newBufObj != NULL) )
+   if (ctx->Driver.BindBuffer && newBufObj)
       (*ctx->Driver.BindBuffer)( ctx, target, newBufObj );
 
-   if ( oldBufObj != NULL ) {
+   if (oldBufObj) {
       oldBufObj->RefCount--;
       assert(oldBufObj->RefCount >= 0);
       if (oldBufObj->RefCount == 0) {
@@ -642,7 +640,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
       return;
    }
 
-   if ( buffer == NULL ) {
+   if (!buffer) {
       return;
    }
 
@@ -727,7 +725,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
    }
 
    bufObj = buffer_object_get_target( ctx, target, "BufferDataARB" );
-   if ( bufObj == NULL ) {
+   if (!bufObj || bufObj->Name ==0) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB" );
       return;
    }
@@ -813,19 +811,19 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    }
 
    bufObj = buffer_object_get_target( ctx, target, "MapBufferARB" );
-   if ( bufObj == NULL ) {
+   if (!bufObj || bufObj->Name == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB" );
       return NULL;
    }
 
-   if ( bufObj->Pointer != NULL ) {
+   if (bufObj->Pointer) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
       return NULL;
    }
 
    ASSERT(ctx->Driver.MapBuffer);
    bufObj->Pointer = (*ctx->Driver.MapBuffer)( ctx, target, access, bufObj );
-   if ( bufObj->Pointer == NULL ) {
+   if (!bufObj->Pointer) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
    }
 
@@ -844,17 +842,17 @@ _mesa_UnmapBufferARB(GLenum target)
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
    bufObj = buffer_object_get_target( ctx, target, "UnmapBufferARB" );
-   if ( bufObj == NULL ) {
+   if (!bufObj || bufObj->Name == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
       return GL_FALSE;
    }
 
-   if ( bufObj->Pointer == NULL ) {
+   if (!bufObj->Pointer) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
       return GL_FALSE;
    }
 
-   if ( ctx->Driver.UnmapBuffer != NULL ) {
+   if (ctx->Driver.UnmapBuffer) {
       status = (*ctx->Driver.UnmapBuffer)( ctx, target, bufObj );
    }
 
@@ -873,7 +871,7 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    bufObj = buffer_object_get_target( ctx, target, "GetBufferParameterivARB" );
-   if (!bufObj) {
+   if (!bufObj || bufObj->Name == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" );
       return;
    }
@@ -911,7 +909,7 @@ _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
    }
 
    bufObj = buffer_object_get_target( ctx, target, "GetBufferPointervARB" );
-   if ( bufObj == NULL ) {
+   if (!bufObj || bufObj->Name == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );
       return;
    }
diff --git a/extras/Mesa/src/mesa/main/convolve.c b/extras/Mesa/src/mesa/main/convolve.c
index adc279069..cf4bddc3a 100644
--- a/extras/Mesa/src/mesa/main/convolve.c
+++ b/extras/Mesa/src/mesa/main/convolve.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.2
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -834,7 +834,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    }
 
    /* unpack column filter */
-   _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
+   _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
                                  &ctx->Separable2D.Filter[colStart],
                                  format, type, column, &ctx->Unpack,
                                  0); /* transferOps */
@@ -844,7 +844,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
       const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[2];
       const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[2];
       GLint i;
-      for (i = 0; i < width; i++) {
+      for (i = 0; i < height; i++) {
          GLfloat r = ctx->Separable2D.Filter[i * 4 + 0 + colStart];
          GLfloat g = ctx->Separable2D.Filter[i * 4 + 1 + colStart];
          GLfloat b = ctx->Separable2D.Filter[i * 4 + 2 + colStart];
diff --git a/extras/Mesa/src/mesa/main/dlist.c b/extras/Mesa/src/mesa/main/dlist.c
index ebf3af326..aad03c0ba 100644
--- a/extras/Mesa/src/mesa/main/dlist.c
+++ b/extras/Mesa/src/mesa/main/dlist.c
@@ -7660,7 +7660,7 @@ static void GLAPIENTRY print_list( GLcontext *ctx, GLuint list )
    Node *n;
    GLboolean done;
 
-   if (!glIsList(list)) {
+   if (!GL_CALL(IsList)(list)) {
       _mesa_printf("%u is not a display list ID\n", list);
       return;
    }
diff --git a/extras/Mesa/src/mesa/main/imports.c b/extras/Mesa/src/mesa/main/imports.c
index ae0e86add..df1270c78 100644
--- a/extras/Mesa/src/mesa/main/imports.c
+++ b/extras/Mesa/src/mesa/main/imports.c
@@ -32,7 +32,7 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.2
+ * Version:  6.2.1
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -907,10 +907,10 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
 
 #if defined(XFree86LOADER) && defined(IN_MODULE)
    xf86fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);
-   xf86fprintf(stderr, "Please report to the DRI project at dri.sourceforge.net\n");
+   xf86fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
 #else
    fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);
-   fprintf(stderr, "Please report to the Mesa bug database at www.mesa3d.org\n" );
+   fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
 #endif
 }
 
diff --git a/extras/Mesa/src/mesa/main/imports.h b/extras/Mesa/src/mesa/main/imports.h
index 93eefd61c..86480c82b 100644
--- a/extras/Mesa/src/mesa/main/imports.h
+++ b/extras/Mesa/src/mesa/main/imports.h
@@ -224,7 +224,7 @@ extern void _ext_mesa_free_pixelbuffer( void *pb );
  ***/
 #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
     defined(__s390x__) || defined(__powerpc__) || \
-    defined(__AMD64__) || \
+    defined(__amd64__) || \
     defined(ia64) || defined(__ia64__) || \
     defined(__hppa__) || defined(hpux) || \
     defined(__mips) || defined(_MIPS_ARCH) || \
diff --git a/extras/Mesa/src/mesa/main/state.c b/extras/Mesa/src/mesa/main/state.c
index 21e07e70d..148787981 100644
--- a/extras/Mesa/src/mesa/main/state.c
+++ b/extras/Mesa/src/mesa/main/state.c
@@ -119,7 +119,7 @@ generic_noop(void)
 void
 _mesa_init_no_op_table(struct _glapi_table *table, GLuint tableSize)
 {
-   typedef void (*func_ptr_t)();
+   typedef void (*func_ptr_t)(void);
    GLuint i;
    func_ptr_t *dispatch = (func_ptr_t *) table;
    for (i = 0; i < tableSize; i++) {
diff --git a/extras/Mesa/src/mesa/main/texformat_tmp.h b/extras/Mesa/src/mesa/main/texformat_tmp.h
index d341c7864..7f126714c 100644
--- a/extras/Mesa/src/mesa/main/texformat_tmp.h
+++ b/extras/Mesa/src/mesa/main/texformat_tmp.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.2
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -1023,9 +1023,9 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
 			GLint i, GLint j, GLint k, GLchan *texel )
 {
    const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
-   const GLuint index = *src;
    const struct gl_color_table *palette;
    const GLchan *table;
+   GLuint index;
    GET_CURRENT_CONTEXT(ctx);
 
    if (ctx->Texture.SharedPalette) {
@@ -1039,6 +1039,9 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
    ASSERT(palette->Type != GL_FLOAT);
    table = (const GLchan *) palette->Table;
 
+   /* Mask the index against size of palette to avoid going out of bounds */
+   index = (*src) & (palette->Size - 1);
+
    switch (palette->Format) {
       case GL_ALPHA:
          texel[RCOMP] =
diff --git a/extras/Mesa/src/mesa/main/teximage.c b/extras/Mesa/src/mesa/main/teximage.c
index 8f27af970..87bb62751 100644
--- a/extras/Mesa/src/mesa/main/teximage.c
+++ b/extras/Mesa/src/mesa/main/teximage.c
@@ -330,6 +330,9 @@ static GLboolean
 is_color_format(GLenum format)
 {
    switch (format) {
+      case GL_RED:
+      case GL_GREEN:
+      case GL_BLUE:
       case GL_ALPHA:
       case GL_ALPHA4:
       case GL_ALPHA8:
@@ -882,11 +885,9 @@ _mesa_max_texture_levels(GLcontext *ctx, GLenum target)
    case GL_TEXTURE_CUBE_MAP_ARB:
    case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
       return ctx->Const.MaxCubeTextureLevels;
-      break;
    case GL_TEXTURE_RECTANGLE_NV:
    case GL_PROXY_TEXTURE_RECTANGLE_NV:
       return 1;
-      break;
    default:
       return 0; /* bad target */
    }
@@ -2798,6 +2799,9 @@ compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
    if (!is_compressed_format(ctx, internalFormat))
       return GL_INVALID_ENUM;
 
+   if (_mesa_base_tex_format(ctx, internalFormat) < 0)
+      return GL_INVALID_ENUM;
+
    if (border != 0)
       return GL_INVALID_VALUE;
 
diff --git a/extras/Mesa/src/mesa/main/version.h b/extras/Mesa/src/mesa/main/version.h
index 7b93007f0..997bb0b09 100644
--- a/extras/Mesa/src/mesa/main/version.h
+++ b/extras/Mesa/src/mesa/main/version.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.2
+ * Version:  6.2.1
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -30,8 +30,8 @@
 /* Mesa version */
 #define MESA_MAJOR 6
 #define MESA_MINOR 2
-#define MESA_PATCH 0
-#define MESA_VERSION_STRING "6.2"
+#define MESA_PATCH 1
+#define MESA_VERSION_STRING "6.2.1"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/extras/Mesa/src/mesa/main/vtxfmt.c b/extras/Mesa/src/mesa/main/vtxfmt.c
index e45e5ca22..97b75da49 100644
--- a/extras/Mesa/src/mesa/main/vtxfmt.c
+++ b/extras/Mesa/src/mesa/main/vtxfmt.c
@@ -49,7 +49,7 @@
 {									\
    GET_CURRENT_CONTEXT(ctx);						\
    struct gl_tnl_module *tnl = &(ctx->TnlModule);			\
-   typedef void (*func_ptr_t)();					\
+   typedef void (*func_ptr_t)(void);					\
 									\
    ASSERT( tnl->Current );						\
    ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES );		\
diff --git a/extras/Mesa/src/mesa/shader/arbprogparse.c b/extras/Mesa/src/mesa/shader/arbprogparse.c
index 5b5924c73..28a84fba9 100644
--- a/extras/Mesa/src/mesa/shader/arbprogparse.c
+++ b/extras/Mesa/src/mesa/shader/arbprogparse.c
@@ -3714,7 +3714,7 @@ static int set_reg8 (GLcontext *ctx, grammar id, const byte *name, byte value)
 
 static int extension_is_supported (const GLubyte *ext)
 {
-   const GLubyte *extensions = glGetString (GL_EXTENSIONS);
+   const GLubyte *extensions = GL_CALL(GetString)(GL_EXTENSIONS);
    const GLubyte *end = extensions + _mesa_strlen ((const char *) extensions);
    const GLint ext_len = _mesa_strlen ((const char *) ext);
 
diff --git a/extras/Mesa/src/mesa/shader/arbprogram.c b/extras/Mesa/src/mesa/shader/arbprogram.c
index f6d16b554..d9b1b1d2b 100644
--- a/extras/Mesa/src/mesa/shader/arbprogram.c
+++ b/extras/Mesa/src/mesa/shader/arbprogram.c
@@ -262,7 +262,7 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
       }
       ASSIGN_4V(ctx->FragmentProgram.Parameters[index], x, y, z, w);
    }
-   if (target == GL_VERTEX_PROGRAM_ARB
+   else if (target == GL_VERTEX_PROGRAM_ARB
        && ctx->Extensions.ARB_vertex_program) {
       if (index >= ctx->Const.MaxVertexProgramEnvParams) {
          _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
@@ -322,7 +322,7 @@ _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
       }
       COPY_4V(params, ctx->FragmentProgram.Parameters[index]);
    }
-   if (target == GL_VERTEX_PROGRAM_ARB
+   else if (target == GL_VERTEX_PROGRAM_ARB
        && ctx->Extensions.ARB_vertex_program) {
       if (index >= ctx->Const.MaxVertexProgramEnvParams) {
          _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramEnvParameter(index)");
diff --git a/extras/Mesa/src/mesa/shader/grammar.c b/extras/Mesa/src/mesa/shader/grammar.c
index fa2e96901..6757c7a0c 100644
--- a/extras/Mesa/src/mesa/shader/grammar.c
+++ b/extras/Mesa/src/mesa/shader/grammar.c
@@ -277,7 +277,7 @@ static int error_position = -1;
 
 static byte *unknown = (byte *) "???";
 
-static void clear_last_error ()
+static void clear_last_error (void)
 {
     /* reset error message */
     error_message = NULL;
@@ -768,7 +768,7 @@ static void rule_append (rule **ru, rule **nr)
 /*
     returns unique grammar id
 */
-static grammar next_valid_grammar_id ()
+static grammar next_valid_grammar_id (void)
 {
     static grammar id = 0;
 
diff --git a/extras/Mesa/src/mesa/shader/program.c b/extras/Mesa/src/mesa/shader/program.c
index 88085f811..c2f4b146b 100644
--- a/extras/Mesa/src/mesa/shader/program.c
+++ b/extras/Mesa/src/mesa/shader/program.c
@@ -541,8 +541,7 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
             _mesa_problem(ctx, "Invalid material state in fetch_state");
             return;
          }
-      };
-      return;
+      }
    case STATE_LIGHT:
       {
          /* state[1] is the light number */
@@ -590,7 +589,6 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
             return;
          }
       }
-      return;
    case STATE_LIGHTMODEL_AMBIENT:
       COPY_4V(value, ctx->Light.Model.Ambient);
       return;
@@ -650,7 +648,6 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
                return;
          }
       }
-      return;
    case STATE_TEXGEN:
       {
          /* state[1] is the texture unit */
@@ -686,7 +683,6 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
             return;
          }
       }
-      return;
    case STATE_TEXENV_COLOR:
       {		
          /* state[1] is the texture unit */
diff --git a/extras/Mesa/src/mesa/sparc/clip.S b/extras/Mesa/src/mesa/sparc/clip.S
index 4243cae45..4b7e48f8e 100644
--- a/extras/Mesa/src/mesa/sparc/clip.S
+++ b/extras/Mesa/src/mesa/sparc/clip.S
@@ -2,7 +2,7 @@
  * Clip testing in SPARC assembly
  */
 
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 #define LDPTR		ldx
 #define V4F_DATA	0x00
 #define V4F_START	0x08
diff --git a/extras/Mesa/src/mesa/sparc/glapi_sparc.S b/extras/Mesa/src/mesa/sparc/glapi_sparc.S
index 75567444b..7654c927d 100644
--- a/extras/Mesa/src/mesa/sparc/glapi_sparc.S
+++ b/extras/Mesa/src/mesa/sparc/glapi_sparc.S
@@ -24,7 +24,7 @@ _mesa_sparc_glapi_begin:
 .globl glNewList
 .type glNewList,#function
 glNewList:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -45,7 +45,7 @@ glNewList:
 .globl glEndList
 .type glEndList,#function
 glEndList:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -66,7 +66,7 @@ glEndList:
 .globl glCallList
 .type glCallList,#function
 glCallList:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -87,7 +87,7 @@ glCallList:
 .globl glCallLists
 .type glCallLists,#function
 glCallLists:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -108,7 +108,7 @@ glCallLists:
 .globl glDeleteLists
 .type glDeleteLists,#function
 glDeleteLists:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -129,7 +129,7 @@ glDeleteLists:
 .globl glGenLists
 .type glGenLists,#function
 glGenLists:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -150,7 +150,7 @@ glGenLists:
 .globl glListBase
 .type glListBase,#function
 glListBase:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -171,7 +171,7 @@ glListBase:
 .globl glBegin
 .type glBegin,#function
 glBegin:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -192,7 +192,7 @@ glBegin:
 .globl glBitmap
 .type glBitmap,#function
 glBitmap:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -213,7 +213,7 @@ glBitmap:
 .globl glColor3b
 .type glColor3b,#function
 glColor3b:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -234,7 +234,7 @@ glColor3b:
 .globl glColor3bv
 .type glColor3bv,#function
 glColor3bv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -255,7 +255,7 @@ glColor3bv:
 .globl glColor3d
 .type glColor3d,#function
 glColor3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -276,7 +276,7 @@ glColor3d:
 .globl glColor3dv
 .type glColor3dv,#function
 glColor3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -297,7 +297,7 @@ glColor3dv:
 .globl glColor3f
 .type glColor3f,#function
 glColor3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -318,7 +318,7 @@ glColor3f:
 .globl glColor3fv
 .type glColor3fv,#function
 glColor3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -339,7 +339,7 @@ glColor3fv:
 .globl glColor3i
 .type glColor3i,#function
 glColor3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -360,7 +360,7 @@ glColor3i:
 .globl glColor3iv
 .type glColor3iv,#function
 glColor3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -381,7 +381,7 @@ glColor3iv:
 .globl glColor3s
 .type glColor3s,#function
 glColor3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -402,7 +402,7 @@ glColor3s:
 .globl glColor3sv
 .type glColor3sv,#function
 glColor3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -423,7 +423,7 @@ glColor3sv:
 .globl glColor3ub
 .type glColor3ub,#function
 glColor3ub:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -444,7 +444,7 @@ glColor3ub:
 .globl glColor3ubv
 .type glColor3ubv,#function
 glColor3ubv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -465,7 +465,7 @@ glColor3ubv:
 .globl glColor3ui
 .type glColor3ui,#function
 glColor3ui:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -486,7 +486,7 @@ glColor3ui:
 .globl glColor3uiv
 .type glColor3uiv,#function
 glColor3uiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -507,7 +507,7 @@ glColor3uiv:
 .globl glColor3us
 .type glColor3us,#function
 glColor3us:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -528,7 +528,7 @@ glColor3us:
 .globl glColor3usv
 .type glColor3usv,#function
 glColor3usv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -549,7 +549,7 @@ glColor3usv:
 .globl glColor4b
 .type glColor4b,#function
 glColor4b:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -570,7 +570,7 @@ glColor4b:
 .globl glColor4bv
 .type glColor4bv,#function
 glColor4bv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -591,7 +591,7 @@ glColor4bv:
 .globl glColor4d
 .type glColor4d,#function
 glColor4d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -612,7 +612,7 @@ glColor4d:
 .globl glColor4dv
 .type glColor4dv,#function
 glColor4dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -633,7 +633,7 @@ glColor4dv:
 .globl glColor4f
 .type glColor4f,#function
 glColor4f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -654,7 +654,7 @@ glColor4f:
 .globl glColor4fv
 .type glColor4fv,#function
 glColor4fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -675,7 +675,7 @@ glColor4fv:
 .globl glColor4i
 .type glColor4i,#function
 glColor4i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -696,7 +696,7 @@ glColor4i:
 .globl glColor4iv
 .type glColor4iv,#function
 glColor4iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -717,7 +717,7 @@ glColor4iv:
 .globl glColor4s
 .type glColor4s,#function
 glColor4s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -738,7 +738,7 @@ glColor4s:
 .globl glColor4sv
 .type glColor4sv,#function
 glColor4sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -759,7 +759,7 @@ glColor4sv:
 .globl glColor4ub
 .type glColor4ub,#function
 glColor4ub:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -780,7 +780,7 @@ glColor4ub:
 .globl glColor4ubv
 .type glColor4ubv,#function
 glColor4ubv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -801,7 +801,7 @@ glColor4ubv:
 .globl glColor4ui
 .type glColor4ui,#function
 glColor4ui:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -822,7 +822,7 @@ glColor4ui:
 .globl glColor4uiv
 .type glColor4uiv,#function
 glColor4uiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -843,7 +843,7 @@ glColor4uiv:
 .globl glColor4us
 .type glColor4us,#function
 glColor4us:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -864,7 +864,7 @@ glColor4us:
 .globl glColor4usv
 .type glColor4usv,#function
 glColor4usv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -885,7 +885,7 @@ glColor4usv:
 .globl glEdgeFlag
 .type glEdgeFlag,#function
 glEdgeFlag:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -906,7 +906,7 @@ glEdgeFlag:
 .globl glEdgeFlagv
 .type glEdgeFlagv,#function
 glEdgeFlagv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -927,7 +927,7 @@ glEdgeFlagv:
 .globl glEnd
 .type glEnd,#function
 glEnd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -948,7 +948,7 @@ glEnd:
 .globl glIndexd
 .type glIndexd,#function
 glIndexd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -969,7 +969,7 @@ glIndexd:
 .globl glIndexdv
 .type glIndexdv,#function
 glIndexdv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -990,7 +990,7 @@ glIndexdv:
 .globl glIndexf
 .type glIndexf,#function
 glIndexf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1011,7 +1011,7 @@ glIndexf:
 .globl glIndexfv
 .type glIndexfv,#function
 glIndexfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1032,7 +1032,7 @@ glIndexfv:
 .globl glIndexi
 .type glIndexi,#function
 glIndexi:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1053,7 +1053,7 @@ glIndexi:
 .globl glIndexiv
 .type glIndexiv,#function
 glIndexiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1074,7 +1074,7 @@ glIndexiv:
 .globl glIndexs
 .type glIndexs,#function
 glIndexs:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1095,7 +1095,7 @@ glIndexs:
 .globl glIndexsv
 .type glIndexsv,#function
 glIndexsv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1116,7 +1116,7 @@ glIndexsv:
 .globl glNormal3b
 .type glNormal3b,#function
 glNormal3b:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1137,7 +1137,7 @@ glNormal3b:
 .globl glNormal3bv
 .type glNormal3bv,#function
 glNormal3bv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1158,7 +1158,7 @@ glNormal3bv:
 .globl glNormal3d
 .type glNormal3d,#function
 glNormal3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1179,7 +1179,7 @@ glNormal3d:
 .globl glNormal3dv
 .type glNormal3dv,#function
 glNormal3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1200,7 +1200,7 @@ glNormal3dv:
 .globl glNormal3f
 .type glNormal3f,#function
 glNormal3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1221,7 +1221,7 @@ glNormal3f:
 .globl glNormal3fv
 .type glNormal3fv,#function
 glNormal3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1242,7 +1242,7 @@ glNormal3fv:
 .globl glNormal3i
 .type glNormal3i,#function
 glNormal3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1263,7 +1263,7 @@ glNormal3i:
 .globl glNormal3iv
 .type glNormal3iv,#function
 glNormal3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1284,7 +1284,7 @@ glNormal3iv:
 .globl glNormal3s
 .type glNormal3s,#function
 glNormal3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1305,7 +1305,7 @@ glNormal3s:
 .globl glNormal3sv
 .type glNormal3sv,#function
 glNormal3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1326,7 +1326,7 @@ glNormal3sv:
 .globl glRasterPos2d
 .type glRasterPos2d,#function
 glRasterPos2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1347,7 +1347,7 @@ glRasterPos2d:
 .globl glRasterPos2dv
 .type glRasterPos2dv,#function
 glRasterPos2dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1368,7 +1368,7 @@ glRasterPos2dv:
 .globl glRasterPos2f
 .type glRasterPos2f,#function
 glRasterPos2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1389,7 +1389,7 @@ glRasterPos2f:
 .globl glRasterPos2fv
 .type glRasterPos2fv,#function
 glRasterPos2fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1410,7 +1410,7 @@ glRasterPos2fv:
 .globl glRasterPos2i
 .type glRasterPos2i,#function
 glRasterPos2i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1431,7 +1431,7 @@ glRasterPos2i:
 .globl glRasterPos2iv
 .type glRasterPos2iv,#function
 glRasterPos2iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1452,7 +1452,7 @@ glRasterPos2iv:
 .globl glRasterPos2s
 .type glRasterPos2s,#function
 glRasterPos2s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1473,7 +1473,7 @@ glRasterPos2s:
 .globl glRasterPos2sv
 .type glRasterPos2sv,#function
 glRasterPos2sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1494,7 +1494,7 @@ glRasterPos2sv:
 .globl glRasterPos3d
 .type glRasterPos3d,#function
 glRasterPos3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1515,7 +1515,7 @@ glRasterPos3d:
 .globl glRasterPos3dv
 .type glRasterPos3dv,#function
 glRasterPos3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1536,7 +1536,7 @@ glRasterPos3dv:
 .globl glRasterPos3f
 .type glRasterPos3f,#function
 glRasterPos3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1557,7 +1557,7 @@ glRasterPos3f:
 .globl glRasterPos3fv
 .type glRasterPos3fv,#function
 glRasterPos3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1578,7 +1578,7 @@ glRasterPos3fv:
 .globl glRasterPos3i
 .type glRasterPos3i,#function
 glRasterPos3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1599,7 +1599,7 @@ glRasterPos3i:
 .globl glRasterPos3iv
 .type glRasterPos3iv,#function
 glRasterPos3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1620,7 +1620,7 @@ glRasterPos3iv:
 .globl glRasterPos3s
 .type glRasterPos3s,#function
 glRasterPos3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1641,7 +1641,7 @@ glRasterPos3s:
 .globl glRasterPos3sv
 .type glRasterPos3sv,#function
 glRasterPos3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1662,7 +1662,7 @@ glRasterPos3sv:
 .globl glRasterPos4d
 .type glRasterPos4d,#function
 glRasterPos4d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1683,7 +1683,7 @@ glRasterPos4d:
 .globl glRasterPos4dv
 .type glRasterPos4dv,#function
 glRasterPos4dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1704,7 +1704,7 @@ glRasterPos4dv:
 .globl glRasterPos4f
 .type glRasterPos4f,#function
 glRasterPos4f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1725,7 +1725,7 @@ glRasterPos4f:
 .globl glRasterPos4fv
 .type glRasterPos4fv,#function
 glRasterPos4fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1746,7 +1746,7 @@ glRasterPos4fv:
 .globl glRasterPos4i
 .type glRasterPos4i,#function
 glRasterPos4i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1767,7 +1767,7 @@ glRasterPos4i:
 .globl glRasterPos4iv
 .type glRasterPos4iv,#function
 glRasterPos4iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1788,7 +1788,7 @@ glRasterPos4iv:
 .globl glRasterPos4s
 .type glRasterPos4s,#function
 glRasterPos4s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1809,7 +1809,7 @@ glRasterPos4s:
 .globl glRasterPos4sv
 .type glRasterPos4sv,#function
 glRasterPos4sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1830,7 +1830,7 @@ glRasterPos4sv:
 .globl glRectd
 .type glRectd,#function
 glRectd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1851,7 +1851,7 @@ glRectd:
 .globl glRectdv
 .type glRectdv,#function
 glRectdv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1872,7 +1872,7 @@ glRectdv:
 .globl glRectf
 .type glRectf,#function
 glRectf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1893,7 +1893,7 @@ glRectf:
 .globl glRectfv
 .type glRectfv,#function
 glRectfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1914,7 +1914,7 @@ glRectfv:
 .globl glRecti
 .type glRecti,#function
 glRecti:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1935,7 +1935,7 @@ glRecti:
 .globl glRectiv
 .type glRectiv,#function
 glRectiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1956,7 +1956,7 @@ glRectiv:
 .globl glRects
 .type glRects,#function
 glRects:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1977,7 +1977,7 @@ glRects:
 .globl glRectsv
 .type glRectsv,#function
 glRectsv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -1998,7 +1998,7 @@ glRectsv:
 .globl glTexCoord1d
 .type glTexCoord1d,#function
 glTexCoord1d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2019,7 +2019,7 @@ glTexCoord1d:
 .globl glTexCoord1dv
 .type glTexCoord1dv,#function
 glTexCoord1dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2040,7 +2040,7 @@ glTexCoord1dv:
 .globl glTexCoord1f
 .type glTexCoord1f,#function
 glTexCoord1f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2061,7 +2061,7 @@ glTexCoord1f:
 .globl glTexCoord1fv
 .type glTexCoord1fv,#function
 glTexCoord1fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2082,7 +2082,7 @@ glTexCoord1fv:
 .globl glTexCoord1i
 .type glTexCoord1i,#function
 glTexCoord1i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2103,7 +2103,7 @@ glTexCoord1i:
 .globl glTexCoord1iv
 .type glTexCoord1iv,#function
 glTexCoord1iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2124,7 +2124,7 @@ glTexCoord1iv:
 .globl glTexCoord1s
 .type glTexCoord1s,#function
 glTexCoord1s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2145,7 +2145,7 @@ glTexCoord1s:
 .globl glTexCoord1sv
 .type glTexCoord1sv,#function
 glTexCoord1sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2166,7 +2166,7 @@ glTexCoord1sv:
 .globl glTexCoord2d
 .type glTexCoord2d,#function
 glTexCoord2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2187,7 +2187,7 @@ glTexCoord2d:
 .globl glTexCoord2dv
 .type glTexCoord2dv,#function
 glTexCoord2dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2208,7 +2208,7 @@ glTexCoord2dv:
 .globl glTexCoord2f
 .type glTexCoord2f,#function
 glTexCoord2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2229,7 +2229,7 @@ glTexCoord2f:
 .globl glTexCoord2fv
 .type glTexCoord2fv,#function
 glTexCoord2fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2250,7 +2250,7 @@ glTexCoord2fv:
 .globl glTexCoord2i
 .type glTexCoord2i,#function
 glTexCoord2i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2271,7 +2271,7 @@ glTexCoord2i:
 .globl glTexCoord2iv
 .type glTexCoord2iv,#function
 glTexCoord2iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2292,7 +2292,7 @@ glTexCoord2iv:
 .globl glTexCoord2s
 .type glTexCoord2s,#function
 glTexCoord2s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2313,7 +2313,7 @@ glTexCoord2s:
 .globl glTexCoord2sv
 .type glTexCoord2sv,#function
 glTexCoord2sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2334,7 +2334,7 @@ glTexCoord2sv:
 .globl glTexCoord3d
 .type glTexCoord3d,#function
 glTexCoord3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2355,7 +2355,7 @@ glTexCoord3d:
 .globl glTexCoord3dv
 .type glTexCoord3dv,#function
 glTexCoord3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2376,7 +2376,7 @@ glTexCoord3dv:
 .globl glTexCoord3f
 .type glTexCoord3f,#function
 glTexCoord3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2397,7 +2397,7 @@ glTexCoord3f:
 .globl glTexCoord3fv
 .type glTexCoord3fv,#function
 glTexCoord3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2418,7 +2418,7 @@ glTexCoord3fv:
 .globl glTexCoord3i
 .type glTexCoord3i,#function
 glTexCoord3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2439,7 +2439,7 @@ glTexCoord3i:
 .globl glTexCoord3iv
 .type glTexCoord3iv,#function
 glTexCoord3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2460,7 +2460,7 @@ glTexCoord3iv:
 .globl glTexCoord3s
 .type glTexCoord3s,#function
 glTexCoord3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2481,7 +2481,7 @@ glTexCoord3s:
 .globl glTexCoord3sv
 .type glTexCoord3sv,#function
 glTexCoord3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2502,7 +2502,7 @@ glTexCoord3sv:
 .globl glTexCoord4d
 .type glTexCoord4d,#function
 glTexCoord4d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2523,7 +2523,7 @@ glTexCoord4d:
 .globl glTexCoord4dv
 .type glTexCoord4dv,#function
 glTexCoord4dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2544,7 +2544,7 @@ glTexCoord4dv:
 .globl glTexCoord4f
 .type glTexCoord4f,#function
 glTexCoord4f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2565,7 +2565,7 @@ glTexCoord4f:
 .globl glTexCoord4fv
 .type glTexCoord4fv,#function
 glTexCoord4fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2586,7 +2586,7 @@ glTexCoord4fv:
 .globl glTexCoord4i
 .type glTexCoord4i,#function
 glTexCoord4i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2607,7 +2607,7 @@ glTexCoord4i:
 .globl glTexCoord4iv
 .type glTexCoord4iv,#function
 glTexCoord4iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2628,7 +2628,7 @@ glTexCoord4iv:
 .globl glTexCoord4s
 .type glTexCoord4s,#function
 glTexCoord4s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2649,7 +2649,7 @@ glTexCoord4s:
 .globl glTexCoord4sv
 .type glTexCoord4sv,#function
 glTexCoord4sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2670,7 +2670,7 @@ glTexCoord4sv:
 .globl glVertex2d
 .type glVertex2d,#function
 glVertex2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2691,7 +2691,7 @@ glVertex2d:
 .globl glVertex2dv
 .type glVertex2dv,#function
 glVertex2dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2712,7 +2712,7 @@ glVertex2dv:
 .globl glVertex2f
 .type glVertex2f,#function
 glVertex2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2733,7 +2733,7 @@ glVertex2f:
 .globl glVertex2fv
 .type glVertex2fv,#function
 glVertex2fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2754,7 +2754,7 @@ glVertex2fv:
 .globl glVertex2i
 .type glVertex2i,#function
 glVertex2i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2775,7 +2775,7 @@ glVertex2i:
 .globl glVertex2iv
 .type glVertex2iv,#function
 glVertex2iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2796,7 +2796,7 @@ glVertex2iv:
 .globl glVertex2s
 .type glVertex2s,#function
 glVertex2s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2817,7 +2817,7 @@ glVertex2s:
 .globl glVertex2sv
 .type glVertex2sv,#function
 glVertex2sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2838,7 +2838,7 @@ glVertex2sv:
 .globl glVertex3d
 .type glVertex3d,#function
 glVertex3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2859,7 +2859,7 @@ glVertex3d:
 .globl glVertex3dv
 .type glVertex3dv,#function
 glVertex3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2880,7 +2880,7 @@ glVertex3dv:
 .globl glVertex3f
 .type glVertex3f,#function
 glVertex3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2901,7 +2901,7 @@ glVertex3f:
 .globl glVertex3fv
 .type glVertex3fv,#function
 glVertex3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2922,7 +2922,7 @@ glVertex3fv:
 .globl glVertex3i
 .type glVertex3i,#function
 glVertex3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2943,7 +2943,7 @@ glVertex3i:
 .globl glVertex3iv
 .type glVertex3iv,#function
 glVertex3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2964,7 +2964,7 @@ glVertex3iv:
 .globl glVertex3s
 .type glVertex3s,#function
 glVertex3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -2985,7 +2985,7 @@ glVertex3s:
 .globl glVertex3sv
 .type glVertex3sv,#function
 glVertex3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3006,7 +3006,7 @@ glVertex3sv:
 .globl glVertex4d
 .type glVertex4d,#function
 glVertex4d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3027,7 +3027,7 @@ glVertex4d:
 .globl glVertex4dv
 .type glVertex4dv,#function
 glVertex4dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3048,7 +3048,7 @@ glVertex4dv:
 .globl glVertex4f
 .type glVertex4f,#function
 glVertex4f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3069,7 +3069,7 @@ glVertex4f:
 .globl glVertex4fv
 .type glVertex4fv,#function
 glVertex4fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3090,7 +3090,7 @@ glVertex4fv:
 .globl glVertex4i
 .type glVertex4i,#function
 glVertex4i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3111,7 +3111,7 @@ glVertex4i:
 .globl glVertex4iv
 .type glVertex4iv,#function
 glVertex4iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3132,7 +3132,7 @@ glVertex4iv:
 .globl glVertex4s
 .type glVertex4s,#function
 glVertex4s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3153,7 +3153,7 @@ glVertex4s:
 .globl glVertex4sv
 .type glVertex4sv,#function
 glVertex4sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3174,7 +3174,7 @@ glVertex4sv:
 .globl glClipPlane
 .type glClipPlane,#function
 glClipPlane:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3195,7 +3195,7 @@ glClipPlane:
 .globl glColorMaterial
 .type glColorMaterial,#function
 glColorMaterial:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3216,7 +3216,7 @@ glColorMaterial:
 .globl glCullFace
 .type glCullFace,#function
 glCullFace:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3237,7 +3237,7 @@ glCullFace:
 .globl glFogf
 .type glFogf,#function
 glFogf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3258,7 +3258,7 @@ glFogf:
 .globl glFogfv
 .type glFogfv,#function
 glFogfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3279,7 +3279,7 @@ glFogfv:
 .globl glFogi
 .type glFogi,#function
 glFogi:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3300,7 +3300,7 @@ glFogi:
 .globl glFogiv
 .type glFogiv,#function
 glFogiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3321,7 +3321,7 @@ glFogiv:
 .globl glFrontFace
 .type glFrontFace,#function
 glFrontFace:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3342,7 +3342,7 @@ glFrontFace:
 .globl glHint
 .type glHint,#function
 glHint:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3363,7 +3363,7 @@ glHint:
 .globl glLightf
 .type glLightf,#function
 glLightf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3384,7 +3384,7 @@ glLightf:
 .globl glLightfv
 .type glLightfv,#function
 glLightfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3405,7 +3405,7 @@ glLightfv:
 .globl glLighti
 .type glLighti,#function
 glLighti:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3426,7 +3426,7 @@ glLighti:
 .globl glLightiv
 .type glLightiv,#function
 glLightiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3447,7 +3447,7 @@ glLightiv:
 .globl glLightModelf
 .type glLightModelf,#function
 glLightModelf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3468,7 +3468,7 @@ glLightModelf:
 .globl glLightModelfv
 .type glLightModelfv,#function
 glLightModelfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3489,7 +3489,7 @@ glLightModelfv:
 .globl glLightModeli
 .type glLightModeli,#function
 glLightModeli:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3510,7 +3510,7 @@ glLightModeli:
 .globl glLightModeliv
 .type glLightModeliv,#function
 glLightModeliv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3531,7 +3531,7 @@ glLightModeliv:
 .globl glLineStipple
 .type glLineStipple,#function
 glLineStipple:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3552,7 +3552,7 @@ glLineStipple:
 .globl glLineWidth
 .type glLineWidth,#function
 glLineWidth:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3573,7 +3573,7 @@ glLineWidth:
 .globl glMaterialf
 .type glMaterialf,#function
 glMaterialf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3594,7 +3594,7 @@ glMaterialf:
 .globl glMaterialfv
 .type glMaterialfv,#function
 glMaterialfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3615,7 +3615,7 @@ glMaterialfv:
 .globl glMateriali
 .type glMateriali,#function
 glMateriali:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3636,7 +3636,7 @@ glMateriali:
 .globl glMaterialiv
 .type glMaterialiv,#function
 glMaterialiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3657,7 +3657,7 @@ glMaterialiv:
 .globl glPointSize
 .type glPointSize,#function
 glPointSize:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3678,7 +3678,7 @@ glPointSize:
 .globl glPolygonMode
 .type glPolygonMode,#function
 glPolygonMode:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3699,7 +3699,7 @@ glPolygonMode:
 .globl glPolygonStipple
 .type glPolygonStipple,#function
 glPolygonStipple:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3720,7 +3720,7 @@ glPolygonStipple:
 .globl glScissor
 .type glScissor,#function
 glScissor:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3741,7 +3741,7 @@ glScissor:
 .globl glShadeModel
 .type glShadeModel,#function
 glShadeModel:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3762,7 +3762,7 @@ glShadeModel:
 .globl glTexParameterf
 .type glTexParameterf,#function
 glTexParameterf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3783,7 +3783,7 @@ glTexParameterf:
 .globl glTexParameterfv
 .type glTexParameterfv,#function
 glTexParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3804,7 +3804,7 @@ glTexParameterfv:
 .globl glTexParameteri
 .type glTexParameteri,#function
 glTexParameteri:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3825,7 +3825,7 @@ glTexParameteri:
 .globl glTexParameteriv
 .type glTexParameteriv,#function
 glTexParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3846,7 +3846,7 @@ glTexParameteriv:
 .globl glTexImage1D
 .type glTexImage1D,#function
 glTexImage1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3867,7 +3867,7 @@ glTexImage1D:
 .globl glTexImage2D
 .type glTexImage2D,#function
 glTexImage2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3888,7 +3888,7 @@ glTexImage2D:
 .globl glTexEnvf
 .type glTexEnvf,#function
 glTexEnvf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3909,7 +3909,7 @@ glTexEnvf:
 .globl glTexEnvfv
 .type glTexEnvfv,#function
 glTexEnvfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3930,7 +3930,7 @@ glTexEnvfv:
 .globl glTexEnvi
 .type glTexEnvi,#function
 glTexEnvi:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3951,7 +3951,7 @@ glTexEnvi:
 .globl glTexEnviv
 .type glTexEnviv,#function
 glTexEnviv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3972,7 +3972,7 @@ glTexEnviv:
 .globl glTexGend
 .type glTexGend,#function
 glTexGend:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -3993,7 +3993,7 @@ glTexGend:
 .globl glTexGendv
 .type glTexGendv,#function
 glTexGendv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4014,7 +4014,7 @@ glTexGendv:
 .globl glTexGenf
 .type glTexGenf,#function
 glTexGenf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4035,7 +4035,7 @@ glTexGenf:
 .globl glTexGenfv
 .type glTexGenfv,#function
 glTexGenfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4056,7 +4056,7 @@ glTexGenfv:
 .globl glTexGeni
 .type glTexGeni,#function
 glTexGeni:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4077,7 +4077,7 @@ glTexGeni:
 .globl glTexGeniv
 .type glTexGeniv,#function
 glTexGeniv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4098,7 +4098,7 @@ glTexGeniv:
 .globl glFeedbackBuffer
 .type glFeedbackBuffer,#function
 glFeedbackBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4119,7 +4119,7 @@ glFeedbackBuffer:
 .globl glSelectBuffer
 .type glSelectBuffer,#function
 glSelectBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4140,7 +4140,7 @@ glSelectBuffer:
 .globl glRenderMode
 .type glRenderMode,#function
 glRenderMode:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4161,7 +4161,7 @@ glRenderMode:
 .globl glInitNames
 .type glInitNames,#function
 glInitNames:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4182,7 +4182,7 @@ glInitNames:
 .globl glLoadName
 .type glLoadName,#function
 glLoadName:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4203,7 +4203,7 @@ glLoadName:
 .globl glPassThrough
 .type glPassThrough,#function
 glPassThrough:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4224,7 +4224,7 @@ glPassThrough:
 .globl glPopName
 .type glPopName,#function
 glPopName:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4245,7 +4245,7 @@ glPopName:
 .globl glPushName
 .type glPushName,#function
 glPushName:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4266,7 +4266,7 @@ glPushName:
 .globl glDrawBuffer
 .type glDrawBuffer,#function
 glDrawBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4287,7 +4287,7 @@ glDrawBuffer:
 .globl glClear
 .type glClear,#function
 glClear:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4308,7 +4308,7 @@ glClear:
 .globl glClearAccum
 .type glClearAccum,#function
 glClearAccum:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4329,7 +4329,7 @@ glClearAccum:
 .globl glClearIndex
 .type glClearIndex,#function
 glClearIndex:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4350,7 +4350,7 @@ glClearIndex:
 .globl glClearColor
 .type glClearColor,#function
 glClearColor:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4371,7 +4371,7 @@ glClearColor:
 .globl glClearStencil
 .type glClearStencil,#function
 glClearStencil:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4392,7 +4392,7 @@ glClearStencil:
 .globl glClearDepth
 .type glClearDepth,#function
 glClearDepth:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4413,7 +4413,7 @@ glClearDepth:
 .globl glStencilMask
 .type glStencilMask,#function
 glStencilMask:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4434,7 +4434,7 @@ glStencilMask:
 .globl glColorMask
 .type glColorMask,#function
 glColorMask:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4455,7 +4455,7 @@ glColorMask:
 .globl glDepthMask
 .type glDepthMask,#function
 glDepthMask:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4476,7 +4476,7 @@ glDepthMask:
 .globl glIndexMask
 .type glIndexMask,#function
 glIndexMask:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4497,7 +4497,7 @@ glIndexMask:
 .globl glAccum
 .type glAccum,#function
 glAccum:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4518,7 +4518,7 @@ glAccum:
 .globl glDisable
 .type glDisable,#function
 glDisable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4539,7 +4539,7 @@ glDisable:
 .globl glEnable
 .type glEnable,#function
 glEnable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4560,7 +4560,7 @@ glEnable:
 .globl glFinish
 .type glFinish,#function
 glFinish:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4581,7 +4581,7 @@ glFinish:
 .globl glFlush
 .type glFlush,#function
 glFlush:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4602,7 +4602,7 @@ glFlush:
 .globl glPopAttrib
 .type glPopAttrib,#function
 glPopAttrib:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4623,7 +4623,7 @@ glPopAttrib:
 .globl glPushAttrib
 .type glPushAttrib,#function
 glPushAttrib:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4644,7 +4644,7 @@ glPushAttrib:
 .globl glMap1d
 .type glMap1d,#function
 glMap1d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4665,7 +4665,7 @@ glMap1d:
 .globl glMap1f
 .type glMap1f,#function
 glMap1f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4686,7 +4686,7 @@ glMap1f:
 .globl glMap2d
 .type glMap2d,#function
 glMap2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4707,7 +4707,7 @@ glMap2d:
 .globl glMap2f
 .type glMap2f,#function
 glMap2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4728,7 +4728,7 @@ glMap2f:
 .globl glMapGrid1d
 .type glMapGrid1d,#function
 glMapGrid1d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4749,7 +4749,7 @@ glMapGrid1d:
 .globl glMapGrid1f
 .type glMapGrid1f,#function
 glMapGrid1f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4770,7 +4770,7 @@ glMapGrid1f:
 .globl glMapGrid2d
 .type glMapGrid2d,#function
 glMapGrid2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4791,7 +4791,7 @@ glMapGrid2d:
 .globl glMapGrid2f
 .type glMapGrid2f,#function
 glMapGrid2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4812,7 +4812,7 @@ glMapGrid2f:
 .globl glEvalCoord1d
 .type glEvalCoord1d,#function
 glEvalCoord1d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4833,7 +4833,7 @@ glEvalCoord1d:
 .globl glEvalCoord1dv
 .type glEvalCoord1dv,#function
 glEvalCoord1dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4854,7 +4854,7 @@ glEvalCoord1dv:
 .globl glEvalCoord1f
 .type glEvalCoord1f,#function
 glEvalCoord1f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4875,7 +4875,7 @@ glEvalCoord1f:
 .globl glEvalCoord1fv
 .type glEvalCoord1fv,#function
 glEvalCoord1fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4896,7 +4896,7 @@ glEvalCoord1fv:
 .globl glEvalCoord2d
 .type glEvalCoord2d,#function
 glEvalCoord2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4917,7 +4917,7 @@ glEvalCoord2d:
 .globl glEvalCoord2dv
 .type glEvalCoord2dv,#function
 glEvalCoord2dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4938,7 +4938,7 @@ glEvalCoord2dv:
 .globl glEvalCoord2f
 .type glEvalCoord2f,#function
 glEvalCoord2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4959,7 +4959,7 @@ glEvalCoord2f:
 .globl glEvalCoord2fv
 .type glEvalCoord2fv,#function
 glEvalCoord2fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -4980,7 +4980,7 @@ glEvalCoord2fv:
 .globl glEvalMesh1
 .type glEvalMesh1,#function
 glEvalMesh1:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5001,7 +5001,7 @@ glEvalMesh1:
 .globl glEvalPoint1
 .type glEvalPoint1,#function
 glEvalPoint1:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5022,7 +5022,7 @@ glEvalPoint1:
 .globl glEvalMesh2
 .type glEvalMesh2,#function
 glEvalMesh2:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5043,7 +5043,7 @@ glEvalMesh2:
 .globl glEvalPoint2
 .type glEvalPoint2,#function
 glEvalPoint2:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5064,7 +5064,7 @@ glEvalPoint2:
 .globl glAlphaFunc
 .type glAlphaFunc,#function
 glAlphaFunc:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5085,7 +5085,7 @@ glAlphaFunc:
 .globl glBlendFunc
 .type glBlendFunc,#function
 glBlendFunc:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5106,7 +5106,7 @@ glBlendFunc:
 .globl glLogicOp
 .type glLogicOp,#function
 glLogicOp:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5127,7 +5127,7 @@ glLogicOp:
 .globl glStencilFunc
 .type glStencilFunc,#function
 glStencilFunc:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5148,7 +5148,7 @@ glStencilFunc:
 .globl glStencilOp
 .type glStencilOp,#function
 glStencilOp:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5169,7 +5169,7 @@ glStencilOp:
 .globl glDepthFunc
 .type glDepthFunc,#function
 glDepthFunc:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5190,7 +5190,7 @@ glDepthFunc:
 .globl glPixelZoom
 .type glPixelZoom,#function
 glPixelZoom:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5211,7 +5211,7 @@ glPixelZoom:
 .globl glPixelTransferf
 .type glPixelTransferf,#function
 glPixelTransferf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5232,7 +5232,7 @@ glPixelTransferf:
 .globl glPixelTransferi
 .type glPixelTransferi,#function
 glPixelTransferi:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5253,7 +5253,7 @@ glPixelTransferi:
 .globl glPixelStoref
 .type glPixelStoref,#function
 glPixelStoref:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5274,7 +5274,7 @@ glPixelStoref:
 .globl glPixelStorei
 .type glPixelStorei,#function
 glPixelStorei:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5295,7 +5295,7 @@ glPixelStorei:
 .globl glPixelMapfv
 .type glPixelMapfv,#function
 glPixelMapfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5316,7 +5316,7 @@ glPixelMapfv:
 .globl glPixelMapuiv
 .type glPixelMapuiv,#function
 glPixelMapuiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5337,7 +5337,7 @@ glPixelMapuiv:
 .globl glPixelMapusv
 .type glPixelMapusv,#function
 glPixelMapusv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5358,7 +5358,7 @@ glPixelMapusv:
 .globl glReadBuffer
 .type glReadBuffer,#function
 glReadBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5379,7 +5379,7 @@ glReadBuffer:
 .globl glCopyPixels
 .type glCopyPixels,#function
 glCopyPixels:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5400,7 +5400,7 @@ glCopyPixels:
 .globl glReadPixels
 .type glReadPixels,#function
 glReadPixels:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5421,7 +5421,7 @@ glReadPixels:
 .globl glDrawPixels
 .type glDrawPixels,#function
 glDrawPixels:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5442,7 +5442,7 @@ glDrawPixels:
 .globl glGetBooleanv
 .type glGetBooleanv,#function
 glGetBooleanv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5463,7 +5463,7 @@ glGetBooleanv:
 .globl glGetClipPlane
 .type glGetClipPlane,#function
 glGetClipPlane:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5484,7 +5484,7 @@ glGetClipPlane:
 .globl glGetDoublev
 .type glGetDoublev,#function
 glGetDoublev:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5505,7 +5505,7 @@ glGetDoublev:
 .globl glGetError
 .type glGetError,#function
 glGetError:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5526,7 +5526,7 @@ glGetError:
 .globl glGetFloatv
 .type glGetFloatv,#function
 glGetFloatv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5547,7 +5547,7 @@ glGetFloatv:
 .globl glGetIntegerv
 .type glGetIntegerv,#function
 glGetIntegerv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5568,7 +5568,7 @@ glGetIntegerv:
 .globl glGetLightfv
 .type glGetLightfv,#function
 glGetLightfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5589,7 +5589,7 @@ glGetLightfv:
 .globl glGetLightiv
 .type glGetLightiv,#function
 glGetLightiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5610,7 +5610,7 @@ glGetLightiv:
 .globl glGetMapdv
 .type glGetMapdv,#function
 glGetMapdv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5631,7 +5631,7 @@ glGetMapdv:
 .globl glGetMapfv
 .type glGetMapfv,#function
 glGetMapfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5652,7 +5652,7 @@ glGetMapfv:
 .globl glGetMapiv
 .type glGetMapiv,#function
 glGetMapiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5673,7 +5673,7 @@ glGetMapiv:
 .globl glGetMaterialfv
 .type glGetMaterialfv,#function
 glGetMaterialfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5694,7 +5694,7 @@ glGetMaterialfv:
 .globl glGetMaterialiv
 .type glGetMaterialiv,#function
 glGetMaterialiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5715,7 +5715,7 @@ glGetMaterialiv:
 .globl glGetPixelMapfv
 .type glGetPixelMapfv,#function
 glGetPixelMapfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5736,7 +5736,7 @@ glGetPixelMapfv:
 .globl glGetPixelMapuiv
 .type glGetPixelMapuiv,#function
 glGetPixelMapuiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5757,7 +5757,7 @@ glGetPixelMapuiv:
 .globl glGetPixelMapusv
 .type glGetPixelMapusv,#function
 glGetPixelMapusv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5778,7 +5778,7 @@ glGetPixelMapusv:
 .globl glGetPolygonStipple
 .type glGetPolygonStipple,#function
 glGetPolygonStipple:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5799,7 +5799,7 @@ glGetPolygonStipple:
 .globl glGetString
 .type glGetString,#function
 glGetString:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5820,7 +5820,7 @@ glGetString:
 .globl glGetTexEnvfv
 .type glGetTexEnvfv,#function
 glGetTexEnvfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5841,7 +5841,7 @@ glGetTexEnvfv:
 .globl glGetTexEnviv
 .type glGetTexEnviv,#function
 glGetTexEnviv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5862,7 +5862,7 @@ glGetTexEnviv:
 .globl glGetTexGendv
 .type glGetTexGendv,#function
 glGetTexGendv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5883,7 +5883,7 @@ glGetTexGendv:
 .globl glGetTexGenfv
 .type glGetTexGenfv,#function
 glGetTexGenfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5904,7 +5904,7 @@ glGetTexGenfv:
 .globl glGetTexGeniv
 .type glGetTexGeniv,#function
 glGetTexGeniv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5925,7 +5925,7 @@ glGetTexGeniv:
 .globl glGetTexImage
 .type glGetTexImage,#function
 glGetTexImage:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5946,7 +5946,7 @@ glGetTexImage:
 .globl glGetTexParameterfv
 .type glGetTexParameterfv,#function
 glGetTexParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5967,7 +5967,7 @@ glGetTexParameterfv:
 .globl glGetTexParameteriv
 .type glGetTexParameteriv,#function
 glGetTexParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -5988,7 +5988,7 @@ glGetTexParameteriv:
 .globl glGetTexLevelParameterfv
 .type glGetTexLevelParameterfv,#function
 glGetTexLevelParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6009,7 +6009,7 @@ glGetTexLevelParameterfv:
 .globl glGetTexLevelParameteriv
 .type glGetTexLevelParameteriv,#function
 glGetTexLevelParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6030,7 +6030,7 @@ glGetTexLevelParameteriv:
 .globl glIsEnabled
 .type glIsEnabled,#function
 glIsEnabled:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6051,7 +6051,7 @@ glIsEnabled:
 .globl glIsList
 .type glIsList,#function
 glIsList:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6072,7 +6072,7 @@ glIsList:
 .globl glDepthRange
 .type glDepthRange,#function
 glDepthRange:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6093,7 +6093,7 @@ glDepthRange:
 .globl glFrustum
 .type glFrustum,#function
 glFrustum:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6114,7 +6114,7 @@ glFrustum:
 .globl glLoadIdentity
 .type glLoadIdentity,#function
 glLoadIdentity:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6135,7 +6135,7 @@ glLoadIdentity:
 .globl glLoadMatrixf
 .type glLoadMatrixf,#function
 glLoadMatrixf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6156,7 +6156,7 @@ glLoadMatrixf:
 .globl glLoadMatrixd
 .type glLoadMatrixd,#function
 glLoadMatrixd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6177,7 +6177,7 @@ glLoadMatrixd:
 .globl glMatrixMode
 .type glMatrixMode,#function
 glMatrixMode:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6198,7 +6198,7 @@ glMatrixMode:
 .globl glMultMatrixf
 .type glMultMatrixf,#function
 glMultMatrixf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6219,7 +6219,7 @@ glMultMatrixf:
 .globl glMultMatrixd
 .type glMultMatrixd,#function
 glMultMatrixd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6240,7 +6240,7 @@ glMultMatrixd:
 .globl glOrtho
 .type glOrtho,#function
 glOrtho:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6261,7 +6261,7 @@ glOrtho:
 .globl glPopMatrix
 .type glPopMatrix,#function
 glPopMatrix:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6282,7 +6282,7 @@ glPopMatrix:
 .globl glPushMatrix
 .type glPushMatrix,#function
 glPushMatrix:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6303,7 +6303,7 @@ glPushMatrix:
 .globl glRotated
 .type glRotated,#function
 glRotated:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6324,7 +6324,7 @@ glRotated:
 .globl glRotatef
 .type glRotatef,#function
 glRotatef:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6345,7 +6345,7 @@ glRotatef:
 .globl glScaled
 .type glScaled,#function
 glScaled:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6366,7 +6366,7 @@ glScaled:
 .globl glScalef
 .type glScalef,#function
 glScalef:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6387,7 +6387,7 @@ glScalef:
 .globl glTranslated
 .type glTranslated,#function
 glTranslated:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6408,7 +6408,7 @@ glTranslated:
 .globl glTranslatef
 .type glTranslatef,#function
 glTranslatef:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6429,7 +6429,7 @@ glTranslatef:
 .globl glViewport
 .type glViewport,#function
 glViewport:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6450,7 +6450,7 @@ glViewport:
 .globl glArrayElement
 .type glArrayElement,#function
 glArrayElement:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6471,7 +6471,7 @@ glArrayElement:
 .globl glColorPointer
 .type glColorPointer,#function
 glColorPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6492,7 +6492,7 @@ glColorPointer:
 .globl glDisableClientState
 .type glDisableClientState,#function
 glDisableClientState:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6513,7 +6513,7 @@ glDisableClientState:
 .globl glDrawArrays
 .type glDrawArrays,#function
 glDrawArrays:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6534,7 +6534,7 @@ glDrawArrays:
 .globl glDrawElements
 .type glDrawElements,#function
 glDrawElements:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6555,7 +6555,7 @@ glDrawElements:
 .globl glEdgeFlagPointer
 .type glEdgeFlagPointer,#function
 glEdgeFlagPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6576,7 +6576,7 @@ glEdgeFlagPointer:
 .globl glEnableClientState
 .type glEnableClientState,#function
 glEnableClientState:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6597,7 +6597,7 @@ glEnableClientState:
 .globl glGetPointerv
 .type glGetPointerv,#function
 glGetPointerv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6618,7 +6618,7 @@ glGetPointerv:
 .globl glIndexPointer
 .type glIndexPointer,#function
 glIndexPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6639,7 +6639,7 @@ glIndexPointer:
 .globl glInterleavedArrays
 .type glInterleavedArrays,#function
 glInterleavedArrays:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6660,7 +6660,7 @@ glInterleavedArrays:
 .globl glNormalPointer
 .type glNormalPointer,#function
 glNormalPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6681,7 +6681,7 @@ glNormalPointer:
 .globl glTexCoordPointer
 .type glTexCoordPointer,#function
 glTexCoordPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6702,7 +6702,7 @@ glTexCoordPointer:
 .globl glVertexPointer
 .type glVertexPointer,#function
 glVertexPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6723,7 +6723,7 @@ glVertexPointer:
 .globl glPolygonOffset
 .type glPolygonOffset,#function
 glPolygonOffset:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6744,7 +6744,7 @@ glPolygonOffset:
 .globl glCopyTexImage1D
 .type glCopyTexImage1D,#function
 glCopyTexImage1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6765,7 +6765,7 @@ glCopyTexImage1D:
 .globl glCopyTexImage2D
 .type glCopyTexImage2D,#function
 glCopyTexImage2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6786,7 +6786,7 @@ glCopyTexImage2D:
 .globl glCopyTexSubImage1D
 .type glCopyTexSubImage1D,#function
 glCopyTexSubImage1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6807,7 +6807,7 @@ glCopyTexSubImage1D:
 .globl glCopyTexSubImage2D
 .type glCopyTexSubImage2D,#function
 glCopyTexSubImage2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6828,7 +6828,7 @@ glCopyTexSubImage2D:
 .globl glTexSubImage1D
 .type glTexSubImage1D,#function
 glTexSubImage1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6849,7 +6849,7 @@ glTexSubImage1D:
 .globl glTexSubImage2D
 .type glTexSubImage2D,#function
 glTexSubImage2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6870,7 +6870,7 @@ glTexSubImage2D:
 .globl glAreTexturesResident
 .type glAreTexturesResident,#function
 glAreTexturesResident:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6891,7 +6891,7 @@ glAreTexturesResident:
 .globl glBindTexture
 .type glBindTexture,#function
 glBindTexture:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6912,7 +6912,7 @@ glBindTexture:
 .globl glDeleteTextures
 .type glDeleteTextures,#function
 glDeleteTextures:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6933,7 +6933,7 @@ glDeleteTextures:
 .globl glGenTextures
 .type glGenTextures,#function
 glGenTextures:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6954,7 +6954,7 @@ glGenTextures:
 .globl glIsTexture
 .type glIsTexture,#function
 glIsTexture:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6975,7 +6975,7 @@ glIsTexture:
 .globl glPrioritizeTextures
 .type glPrioritizeTextures,#function
 glPrioritizeTextures:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -6996,7 +6996,7 @@ glPrioritizeTextures:
 .globl glIndexub
 .type glIndexub,#function
 glIndexub:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7017,7 +7017,7 @@ glIndexub:
 .globl glIndexubv
 .type glIndexubv,#function
 glIndexubv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7038,7 +7038,7 @@ glIndexubv:
 .globl glPopClientAttrib
 .type glPopClientAttrib,#function
 glPopClientAttrib:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7059,7 +7059,7 @@ glPopClientAttrib:
 .globl glPushClientAttrib
 .type glPushClientAttrib,#function
 glPushClientAttrib:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7080,7 +7080,7 @@ glPushClientAttrib:
 .globl glBlendColor
 .type glBlendColor,#function
 glBlendColor:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7101,7 +7101,7 @@ glBlendColor:
 .globl glBlendEquation
 .type glBlendEquation,#function
 glBlendEquation:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7122,7 +7122,7 @@ glBlendEquation:
 .globl glDrawRangeElements
 .type glDrawRangeElements,#function
 glDrawRangeElements:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7143,7 +7143,7 @@ glDrawRangeElements:
 .globl glColorTable
 .type glColorTable,#function
 glColorTable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7164,7 +7164,7 @@ glColorTable:
 .globl glColorTableParameterfv
 .type glColorTableParameterfv,#function
 glColorTableParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7185,7 +7185,7 @@ glColorTableParameterfv:
 .globl glColorTableParameteriv
 .type glColorTableParameteriv,#function
 glColorTableParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7206,7 +7206,7 @@ glColorTableParameteriv:
 .globl glCopyColorTable
 .type glCopyColorTable,#function
 glCopyColorTable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7227,7 +7227,7 @@ glCopyColorTable:
 .globl glGetColorTable
 .type glGetColorTable,#function
 glGetColorTable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7248,7 +7248,7 @@ glGetColorTable:
 .globl glGetColorTableParameterfv
 .type glGetColorTableParameterfv,#function
 glGetColorTableParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7269,7 +7269,7 @@ glGetColorTableParameterfv:
 .globl glGetColorTableParameteriv
 .type glGetColorTableParameteriv,#function
 glGetColorTableParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7290,7 +7290,7 @@ glGetColorTableParameteriv:
 .globl glColorSubTable
 .type glColorSubTable,#function
 glColorSubTable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7311,7 +7311,7 @@ glColorSubTable:
 .globl glCopyColorSubTable
 .type glCopyColorSubTable,#function
 glCopyColorSubTable:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7332,7 +7332,7 @@ glCopyColorSubTable:
 .globl glConvolutionFilter1D
 .type glConvolutionFilter1D,#function
 glConvolutionFilter1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7353,7 +7353,7 @@ glConvolutionFilter1D:
 .globl glConvolutionFilter2D
 .type glConvolutionFilter2D,#function
 glConvolutionFilter2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7374,7 +7374,7 @@ glConvolutionFilter2D:
 .globl glConvolutionParameterf
 .type glConvolutionParameterf,#function
 glConvolutionParameterf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7395,7 +7395,7 @@ glConvolutionParameterf:
 .globl glConvolutionParameterfv
 .type glConvolutionParameterfv,#function
 glConvolutionParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7416,7 +7416,7 @@ glConvolutionParameterfv:
 .globl glConvolutionParameteri
 .type glConvolutionParameteri,#function
 glConvolutionParameteri:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7437,7 +7437,7 @@ glConvolutionParameteri:
 .globl glConvolutionParameteriv
 .type glConvolutionParameteriv,#function
 glConvolutionParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7458,7 +7458,7 @@ glConvolutionParameteriv:
 .globl glCopyConvolutionFilter1D
 .type glCopyConvolutionFilter1D,#function
 glCopyConvolutionFilter1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7479,7 +7479,7 @@ glCopyConvolutionFilter1D:
 .globl glCopyConvolutionFilter2D
 .type glCopyConvolutionFilter2D,#function
 glCopyConvolutionFilter2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7500,7 +7500,7 @@ glCopyConvolutionFilter2D:
 .globl glGetConvolutionFilter
 .type glGetConvolutionFilter,#function
 glGetConvolutionFilter:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7521,7 +7521,7 @@ glGetConvolutionFilter:
 .globl glGetConvolutionParameterfv
 .type glGetConvolutionParameterfv,#function
 glGetConvolutionParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7542,7 +7542,7 @@ glGetConvolutionParameterfv:
 .globl glGetConvolutionParameteriv
 .type glGetConvolutionParameteriv,#function
 glGetConvolutionParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7563,7 +7563,7 @@ glGetConvolutionParameteriv:
 .globl glGetSeparableFilter
 .type glGetSeparableFilter,#function
 glGetSeparableFilter:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7584,7 +7584,7 @@ glGetSeparableFilter:
 .globl glSeparableFilter2D
 .type glSeparableFilter2D,#function
 glSeparableFilter2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7605,7 +7605,7 @@ glSeparableFilter2D:
 .globl glGetHistogram
 .type glGetHistogram,#function
 glGetHistogram:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7626,7 +7626,7 @@ glGetHistogram:
 .globl glGetHistogramParameterfv
 .type glGetHistogramParameterfv,#function
 glGetHistogramParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7647,7 +7647,7 @@ glGetHistogramParameterfv:
 .globl glGetHistogramParameteriv
 .type glGetHistogramParameteriv,#function
 glGetHistogramParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7668,7 +7668,7 @@ glGetHistogramParameteriv:
 .globl glGetMinmax
 .type glGetMinmax,#function
 glGetMinmax:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7689,7 +7689,7 @@ glGetMinmax:
 .globl glGetMinmaxParameterfv
 .type glGetMinmaxParameterfv,#function
 glGetMinmaxParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7710,7 +7710,7 @@ glGetMinmaxParameterfv:
 .globl glGetMinmaxParameteriv
 .type glGetMinmaxParameteriv,#function
 glGetMinmaxParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7731,7 +7731,7 @@ glGetMinmaxParameteriv:
 .globl glHistogram
 .type glHistogram,#function
 glHistogram:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7752,7 +7752,7 @@ glHistogram:
 .globl glMinmax
 .type glMinmax,#function
 glMinmax:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7773,7 +7773,7 @@ glMinmax:
 .globl glResetHistogram
 .type glResetHistogram,#function
 glResetHistogram:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7794,7 +7794,7 @@ glResetHistogram:
 .globl glResetMinmax
 .type glResetMinmax,#function
 glResetMinmax:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7815,7 +7815,7 @@ glResetMinmax:
 .globl glTexImage3D
 .type glTexImage3D,#function
 glTexImage3D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7836,7 +7836,7 @@ glTexImage3D:
 .globl glTexSubImage3D
 .type glTexSubImage3D,#function
 glTexSubImage3D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7857,7 +7857,7 @@ glTexSubImage3D:
 .globl glCopyTexSubImage3D
 .type glCopyTexSubImage3D,#function
 glCopyTexSubImage3D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7878,7 +7878,7 @@ glCopyTexSubImage3D:
 .globl glActiveTextureARB
 .type glActiveTextureARB,#function
 glActiveTextureARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7899,7 +7899,7 @@ glActiveTextureARB:
 .globl glClientActiveTextureARB
 .type glClientActiveTextureARB,#function
 glClientActiveTextureARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7920,7 +7920,7 @@ glClientActiveTextureARB:
 .globl glMultiTexCoord1dARB
 .type glMultiTexCoord1dARB,#function
 glMultiTexCoord1dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7941,7 +7941,7 @@ glMultiTexCoord1dARB:
 .globl glMultiTexCoord1dvARB
 .type glMultiTexCoord1dvARB,#function
 glMultiTexCoord1dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7962,7 +7962,7 @@ glMultiTexCoord1dvARB:
 .globl glMultiTexCoord1fARB
 .type glMultiTexCoord1fARB,#function
 glMultiTexCoord1fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -7983,7 +7983,7 @@ glMultiTexCoord1fARB:
 .globl glMultiTexCoord1fvARB
 .type glMultiTexCoord1fvARB,#function
 glMultiTexCoord1fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8004,7 +8004,7 @@ glMultiTexCoord1fvARB:
 .globl glMultiTexCoord1iARB
 .type glMultiTexCoord1iARB,#function
 glMultiTexCoord1iARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8025,7 +8025,7 @@ glMultiTexCoord1iARB:
 .globl glMultiTexCoord1ivARB
 .type glMultiTexCoord1ivARB,#function
 glMultiTexCoord1ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8046,7 +8046,7 @@ glMultiTexCoord1ivARB:
 .globl glMultiTexCoord1sARB
 .type glMultiTexCoord1sARB,#function
 glMultiTexCoord1sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8067,7 +8067,7 @@ glMultiTexCoord1sARB:
 .globl glMultiTexCoord1svARB
 .type glMultiTexCoord1svARB,#function
 glMultiTexCoord1svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8088,7 +8088,7 @@ glMultiTexCoord1svARB:
 .globl glMultiTexCoord2dARB
 .type glMultiTexCoord2dARB,#function
 glMultiTexCoord2dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8109,7 +8109,7 @@ glMultiTexCoord2dARB:
 .globl glMultiTexCoord2dvARB
 .type glMultiTexCoord2dvARB,#function
 glMultiTexCoord2dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8130,7 +8130,7 @@ glMultiTexCoord2dvARB:
 .globl glMultiTexCoord2fARB
 .type glMultiTexCoord2fARB,#function
 glMultiTexCoord2fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8151,7 +8151,7 @@ glMultiTexCoord2fARB:
 .globl glMultiTexCoord2fvARB
 .type glMultiTexCoord2fvARB,#function
 glMultiTexCoord2fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8172,7 +8172,7 @@ glMultiTexCoord2fvARB:
 .globl glMultiTexCoord2iARB
 .type glMultiTexCoord2iARB,#function
 glMultiTexCoord2iARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8193,7 +8193,7 @@ glMultiTexCoord2iARB:
 .globl glMultiTexCoord2ivARB
 .type glMultiTexCoord2ivARB,#function
 glMultiTexCoord2ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8214,7 +8214,7 @@ glMultiTexCoord2ivARB:
 .globl glMultiTexCoord2sARB
 .type glMultiTexCoord2sARB,#function
 glMultiTexCoord2sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8235,7 +8235,7 @@ glMultiTexCoord2sARB:
 .globl glMultiTexCoord2svARB
 .type glMultiTexCoord2svARB,#function
 glMultiTexCoord2svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8256,7 +8256,7 @@ glMultiTexCoord2svARB:
 .globl glMultiTexCoord3dARB
 .type glMultiTexCoord3dARB,#function
 glMultiTexCoord3dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8277,7 +8277,7 @@ glMultiTexCoord3dARB:
 .globl glMultiTexCoord3dvARB
 .type glMultiTexCoord3dvARB,#function
 glMultiTexCoord3dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8298,7 +8298,7 @@ glMultiTexCoord3dvARB:
 .globl glMultiTexCoord3fARB
 .type glMultiTexCoord3fARB,#function
 glMultiTexCoord3fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8319,7 +8319,7 @@ glMultiTexCoord3fARB:
 .globl glMultiTexCoord3fvARB
 .type glMultiTexCoord3fvARB,#function
 glMultiTexCoord3fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8340,7 +8340,7 @@ glMultiTexCoord3fvARB:
 .globl glMultiTexCoord3iARB
 .type glMultiTexCoord3iARB,#function
 glMultiTexCoord3iARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8361,7 +8361,7 @@ glMultiTexCoord3iARB:
 .globl glMultiTexCoord3ivARB
 .type glMultiTexCoord3ivARB,#function
 glMultiTexCoord3ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8382,7 +8382,7 @@ glMultiTexCoord3ivARB:
 .globl glMultiTexCoord3sARB
 .type glMultiTexCoord3sARB,#function
 glMultiTexCoord3sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8403,7 +8403,7 @@ glMultiTexCoord3sARB:
 .globl glMultiTexCoord3svARB
 .type glMultiTexCoord3svARB,#function
 glMultiTexCoord3svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8424,7 +8424,7 @@ glMultiTexCoord3svARB:
 .globl glMultiTexCoord4dARB
 .type glMultiTexCoord4dARB,#function
 glMultiTexCoord4dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8445,7 +8445,7 @@ glMultiTexCoord4dARB:
 .globl glMultiTexCoord4dvARB
 .type glMultiTexCoord4dvARB,#function
 glMultiTexCoord4dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8466,7 +8466,7 @@ glMultiTexCoord4dvARB:
 .globl glMultiTexCoord4fARB
 .type glMultiTexCoord4fARB,#function
 glMultiTexCoord4fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8487,7 +8487,7 @@ glMultiTexCoord4fARB:
 .globl glMultiTexCoord4fvARB
 .type glMultiTexCoord4fvARB,#function
 glMultiTexCoord4fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8508,7 +8508,7 @@ glMultiTexCoord4fvARB:
 .globl glMultiTexCoord4iARB
 .type glMultiTexCoord4iARB,#function
 glMultiTexCoord4iARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8529,7 +8529,7 @@ glMultiTexCoord4iARB:
 .globl glMultiTexCoord4ivARB
 .type glMultiTexCoord4ivARB,#function
 glMultiTexCoord4ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8550,7 +8550,7 @@ glMultiTexCoord4ivARB:
 .globl glMultiTexCoord4sARB
 .type glMultiTexCoord4sARB,#function
 glMultiTexCoord4sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8571,7 +8571,7 @@ glMultiTexCoord4sARB:
 .globl glMultiTexCoord4svARB
 .type glMultiTexCoord4svARB,#function
 glMultiTexCoord4svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8592,7 +8592,7 @@ glMultiTexCoord4svARB:
 .globl glLoadTransposeMatrixfARB
 .type glLoadTransposeMatrixfARB,#function
 glLoadTransposeMatrixfARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8613,7 +8613,7 @@ glLoadTransposeMatrixfARB:
 .globl glLoadTransposeMatrixdARB
 .type glLoadTransposeMatrixdARB,#function
 glLoadTransposeMatrixdARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8634,7 +8634,7 @@ glLoadTransposeMatrixdARB:
 .globl glMultTransposeMatrixfARB
 .type glMultTransposeMatrixfARB,#function
 glMultTransposeMatrixfARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8655,7 +8655,7 @@ glMultTransposeMatrixfARB:
 .globl glMultTransposeMatrixdARB
 .type glMultTransposeMatrixdARB,#function
 glMultTransposeMatrixdARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8676,7 +8676,7 @@ glMultTransposeMatrixdARB:
 .globl glSampleCoverageARB
 .type glSampleCoverageARB,#function
 glSampleCoverageARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8697,7 +8697,7 @@ glSampleCoverageARB:
 .globl gl__unused413
 .type gl__unused413,#function
 gl__unused413:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8718,7 +8718,7 @@ gl__unused413:
 .globl glCompressedTexImage3DARB
 .type glCompressedTexImage3DARB,#function
 glCompressedTexImage3DARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8739,7 +8739,7 @@ glCompressedTexImage3DARB:
 .globl glCompressedTexImage2DARB
 .type glCompressedTexImage2DARB,#function
 glCompressedTexImage2DARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8760,7 +8760,7 @@ glCompressedTexImage2DARB:
 .globl glCompressedTexImage1DARB
 .type glCompressedTexImage1DARB,#function
 glCompressedTexImage1DARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8781,7 +8781,7 @@ glCompressedTexImage1DARB:
 .globl glCompressedTexSubImage3DARB
 .type glCompressedTexSubImage3DARB,#function
 glCompressedTexSubImage3DARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8802,7 +8802,7 @@ glCompressedTexSubImage3DARB:
 .globl glCompressedTexSubImage2DARB
 .type glCompressedTexSubImage2DARB,#function
 glCompressedTexSubImage2DARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8823,7 +8823,7 @@ glCompressedTexSubImage2DARB:
 .globl glCompressedTexSubImage1DARB
 .type glCompressedTexSubImage1DARB,#function
 glCompressedTexSubImage1DARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8844,7 +8844,7 @@ glCompressedTexSubImage1DARB:
 .globl glGetCompressedTexImageARB
 .type glGetCompressedTexImageARB,#function
 glGetCompressedTexImageARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8865,7 +8865,7 @@ glGetCompressedTexImageARB:
 .globl glActiveTexture
 .type glActiveTexture,#function
 glActiveTexture:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8886,7 +8886,7 @@ glActiveTexture:
 .globl glClientActiveTexture
 .type glClientActiveTexture,#function
 glClientActiveTexture:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8907,7 +8907,7 @@ glClientActiveTexture:
 .globl glMultiTexCoord1d
 .type glMultiTexCoord1d,#function
 glMultiTexCoord1d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8928,7 +8928,7 @@ glMultiTexCoord1d:
 .globl glMultiTexCoord1dv
 .type glMultiTexCoord1dv,#function
 glMultiTexCoord1dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8949,7 +8949,7 @@ glMultiTexCoord1dv:
 .globl glMultiTexCoord1f
 .type glMultiTexCoord1f,#function
 glMultiTexCoord1f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8970,7 +8970,7 @@ glMultiTexCoord1f:
 .globl glMultiTexCoord1fv
 .type glMultiTexCoord1fv,#function
 glMultiTexCoord1fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -8991,7 +8991,7 @@ glMultiTexCoord1fv:
 .globl glMultiTexCoord1i
 .type glMultiTexCoord1i,#function
 glMultiTexCoord1i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9012,7 +9012,7 @@ glMultiTexCoord1i:
 .globl glMultiTexCoord1iv
 .type glMultiTexCoord1iv,#function
 glMultiTexCoord1iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9033,7 +9033,7 @@ glMultiTexCoord1iv:
 .globl glMultiTexCoord1s
 .type glMultiTexCoord1s,#function
 glMultiTexCoord1s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9054,7 +9054,7 @@ glMultiTexCoord1s:
 .globl glMultiTexCoord1sv
 .type glMultiTexCoord1sv,#function
 glMultiTexCoord1sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9075,7 +9075,7 @@ glMultiTexCoord1sv:
 .globl glMultiTexCoord2d
 .type glMultiTexCoord2d,#function
 glMultiTexCoord2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9096,7 +9096,7 @@ glMultiTexCoord2d:
 .globl glMultiTexCoord2dv
 .type glMultiTexCoord2dv,#function
 glMultiTexCoord2dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9117,7 +9117,7 @@ glMultiTexCoord2dv:
 .globl glMultiTexCoord2f
 .type glMultiTexCoord2f,#function
 glMultiTexCoord2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9138,7 +9138,7 @@ glMultiTexCoord2f:
 .globl glMultiTexCoord2fv
 .type glMultiTexCoord2fv,#function
 glMultiTexCoord2fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9159,7 +9159,7 @@ glMultiTexCoord2fv:
 .globl glMultiTexCoord2i
 .type glMultiTexCoord2i,#function
 glMultiTexCoord2i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9180,7 +9180,7 @@ glMultiTexCoord2i:
 .globl glMultiTexCoord2iv
 .type glMultiTexCoord2iv,#function
 glMultiTexCoord2iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9201,7 +9201,7 @@ glMultiTexCoord2iv:
 .globl glMultiTexCoord2s
 .type glMultiTexCoord2s,#function
 glMultiTexCoord2s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9222,7 +9222,7 @@ glMultiTexCoord2s:
 .globl glMultiTexCoord2sv
 .type glMultiTexCoord2sv,#function
 glMultiTexCoord2sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9243,7 +9243,7 @@ glMultiTexCoord2sv:
 .globl glMultiTexCoord3d
 .type glMultiTexCoord3d,#function
 glMultiTexCoord3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9264,7 +9264,7 @@ glMultiTexCoord3d:
 .globl glMultiTexCoord3dv
 .type glMultiTexCoord3dv,#function
 glMultiTexCoord3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9285,7 +9285,7 @@ glMultiTexCoord3dv:
 .globl glMultiTexCoord3f
 .type glMultiTexCoord3f,#function
 glMultiTexCoord3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9306,7 +9306,7 @@ glMultiTexCoord3f:
 .globl glMultiTexCoord3fv
 .type glMultiTexCoord3fv,#function
 glMultiTexCoord3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9327,7 +9327,7 @@ glMultiTexCoord3fv:
 .globl glMultiTexCoord3i
 .type glMultiTexCoord3i,#function
 glMultiTexCoord3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9348,7 +9348,7 @@ glMultiTexCoord3i:
 .globl glMultiTexCoord3iv
 .type glMultiTexCoord3iv,#function
 glMultiTexCoord3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9369,7 +9369,7 @@ glMultiTexCoord3iv:
 .globl glMultiTexCoord3s
 .type glMultiTexCoord3s,#function
 glMultiTexCoord3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9390,7 +9390,7 @@ glMultiTexCoord3s:
 .globl glMultiTexCoord3sv
 .type glMultiTexCoord3sv,#function
 glMultiTexCoord3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9411,7 +9411,7 @@ glMultiTexCoord3sv:
 .globl glMultiTexCoord4d
 .type glMultiTexCoord4d,#function
 glMultiTexCoord4d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9432,7 +9432,7 @@ glMultiTexCoord4d:
 .globl glMultiTexCoord4dv
 .type glMultiTexCoord4dv,#function
 glMultiTexCoord4dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9453,7 +9453,7 @@ glMultiTexCoord4dv:
 .globl glMultiTexCoord4f
 .type glMultiTexCoord4f,#function
 glMultiTexCoord4f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9474,7 +9474,7 @@ glMultiTexCoord4f:
 .globl glMultiTexCoord4fv
 .type glMultiTexCoord4fv,#function
 glMultiTexCoord4fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9495,7 +9495,7 @@ glMultiTexCoord4fv:
 .globl glMultiTexCoord4i
 .type glMultiTexCoord4i,#function
 glMultiTexCoord4i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9516,7 +9516,7 @@ glMultiTexCoord4i:
 .globl glMultiTexCoord4iv
 .type glMultiTexCoord4iv,#function
 glMultiTexCoord4iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9537,7 +9537,7 @@ glMultiTexCoord4iv:
 .globl glMultiTexCoord4s
 .type glMultiTexCoord4s,#function
 glMultiTexCoord4s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9558,7 +9558,7 @@ glMultiTexCoord4s:
 .globl glMultiTexCoord4sv
 .type glMultiTexCoord4sv,#function
 glMultiTexCoord4sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9579,7 +9579,7 @@ glMultiTexCoord4sv:
 .globl glLoadTransposeMatrixf
 .type glLoadTransposeMatrixf,#function
 glLoadTransposeMatrixf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9600,7 +9600,7 @@ glLoadTransposeMatrixf:
 .globl glLoadTransposeMatrixd
 .type glLoadTransposeMatrixd,#function
 glLoadTransposeMatrixd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9621,7 +9621,7 @@ glLoadTransposeMatrixd:
 .globl glMultTransposeMatrixf
 .type glMultTransposeMatrixf,#function
 glMultTransposeMatrixf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9642,7 +9642,7 @@ glMultTransposeMatrixf:
 .globl glMultTransposeMatrixd
 .type glMultTransposeMatrixd,#function
 glMultTransposeMatrixd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9663,7 +9663,7 @@ glMultTransposeMatrixd:
 .globl glSampleCoverage
 .type glSampleCoverage,#function
 glSampleCoverage:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9684,7 +9684,7 @@ glSampleCoverage:
 .globl glCompressedTexImage3D
 .type glCompressedTexImage3D,#function
 glCompressedTexImage3D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9705,7 +9705,7 @@ glCompressedTexImage3D:
 .globl glCompressedTexImage2D
 .type glCompressedTexImage2D,#function
 glCompressedTexImage2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9726,7 +9726,7 @@ glCompressedTexImage2D:
 .globl glCompressedTexImage1D
 .type glCompressedTexImage1D,#function
 glCompressedTexImage1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9747,7 +9747,7 @@ glCompressedTexImage1D:
 .globl glCompressedTexSubImage3D
 .type glCompressedTexSubImage3D,#function
 glCompressedTexSubImage3D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9768,7 +9768,7 @@ glCompressedTexSubImage3D:
 .globl glCompressedTexSubImage2D
 .type glCompressedTexSubImage2D,#function
 glCompressedTexSubImage2D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9789,7 +9789,7 @@ glCompressedTexSubImage2D:
 .globl glCompressedTexSubImage1D
 .type glCompressedTexSubImage1D,#function
 glCompressedTexSubImage1D:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9810,7 +9810,7 @@ glCompressedTexSubImage1D:
 .globl glGetCompressedTexImage
 .type glGetCompressedTexImage,#function
 glGetCompressedTexImage:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9831,7 +9831,7 @@ glGetCompressedTexImage:
 .globl glBlendColorEXT
 .type glBlendColorEXT,#function
 glBlendColorEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9852,7 +9852,7 @@ glBlendColorEXT:
 .globl glPolygonOffsetEXT
 .type glPolygonOffsetEXT,#function
 glPolygonOffsetEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9873,7 +9873,7 @@ glPolygonOffsetEXT:
 .globl glTexImage3DEXT
 .type glTexImage3DEXT,#function
 glTexImage3DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9894,7 +9894,7 @@ glTexImage3DEXT:
 .globl glTexSubImage3DEXT
 .type glTexSubImage3DEXT,#function
 glTexSubImage3DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9915,7 +9915,7 @@ glTexSubImage3DEXT:
 .globl glGetTexFilterFuncSGIS
 .type glGetTexFilterFuncSGIS,#function
 glGetTexFilterFuncSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9936,7 +9936,7 @@ glGetTexFilterFuncSGIS:
 .globl glTexFilterFuncSGIS
 .type glTexFilterFuncSGIS,#function
 glTexFilterFuncSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9957,7 +9957,7 @@ glTexFilterFuncSGIS:
 .globl glTexSubImage1DEXT
 .type glTexSubImage1DEXT,#function
 glTexSubImage1DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9978,7 +9978,7 @@ glTexSubImage1DEXT:
 .globl glTexSubImage2DEXT
 .type glTexSubImage2DEXT,#function
 glTexSubImage2DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -9999,7 +9999,7 @@ glTexSubImage2DEXT:
 .globl glCopyTexImage1DEXT
 .type glCopyTexImage1DEXT,#function
 glCopyTexImage1DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10020,7 +10020,7 @@ glCopyTexImage1DEXT:
 .globl glCopyTexImage2DEXT
 .type glCopyTexImage2DEXT,#function
 glCopyTexImage2DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10041,7 +10041,7 @@ glCopyTexImage2DEXT:
 .globl glCopyTexSubImage1DEXT
 .type glCopyTexSubImage1DEXT,#function
 glCopyTexSubImage1DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10062,7 +10062,7 @@ glCopyTexSubImage1DEXT:
 .globl glCopyTexSubImage2DEXT
 .type glCopyTexSubImage2DEXT,#function
 glCopyTexSubImage2DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10083,7 +10083,7 @@ glCopyTexSubImage2DEXT:
 .globl glCopyTexSubImage3DEXT
 .type glCopyTexSubImage3DEXT,#function
 glCopyTexSubImage3DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10104,7 +10104,7 @@ glCopyTexSubImage3DEXT:
 .globl glGetHistogramEXT
 .type glGetHistogramEXT,#function
 glGetHistogramEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10125,7 +10125,7 @@ glGetHistogramEXT:
 .globl glGetHistogramParameterfvEXT
 .type glGetHistogramParameterfvEXT,#function
 glGetHistogramParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10146,7 +10146,7 @@ glGetHistogramParameterfvEXT:
 .globl glGetHistogramParameterivEXT
 .type glGetHistogramParameterivEXT,#function
 glGetHistogramParameterivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10167,7 +10167,7 @@ glGetHistogramParameterivEXT:
 .globl glGetMinmaxEXT
 .type glGetMinmaxEXT,#function
 glGetMinmaxEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10188,7 +10188,7 @@ glGetMinmaxEXT:
 .globl glGetMinmaxParameterfvEXT
 .type glGetMinmaxParameterfvEXT,#function
 glGetMinmaxParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10209,7 +10209,7 @@ glGetMinmaxParameterfvEXT:
 .globl glGetMinmaxParameterivEXT
 .type glGetMinmaxParameterivEXT,#function
 glGetMinmaxParameterivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10230,7 +10230,7 @@ glGetMinmaxParameterivEXT:
 .globl glHistogramEXT
 .type glHistogramEXT,#function
 glHistogramEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10251,7 +10251,7 @@ glHistogramEXT:
 .globl glMinmaxEXT
 .type glMinmaxEXT,#function
 glMinmaxEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10272,7 +10272,7 @@ glMinmaxEXT:
 .globl glResetHistogramEXT
 .type glResetHistogramEXT,#function
 glResetHistogramEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10293,7 +10293,7 @@ glResetHistogramEXT:
 .globl glResetMinmaxEXT
 .type glResetMinmaxEXT,#function
 glResetMinmaxEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10314,7 +10314,7 @@ glResetMinmaxEXT:
 .globl glConvolutionFilter1DEXT
 .type glConvolutionFilter1DEXT,#function
 glConvolutionFilter1DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10335,7 +10335,7 @@ glConvolutionFilter1DEXT:
 .globl glConvolutionFilter2DEXT
 .type glConvolutionFilter2DEXT,#function
 glConvolutionFilter2DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10356,7 +10356,7 @@ glConvolutionFilter2DEXT:
 .globl glConvolutionParameterfEXT
 .type glConvolutionParameterfEXT,#function
 glConvolutionParameterfEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10377,7 +10377,7 @@ glConvolutionParameterfEXT:
 .globl glConvolutionParameterfvEXT
 .type glConvolutionParameterfvEXT,#function
 glConvolutionParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10398,7 +10398,7 @@ glConvolutionParameterfvEXT:
 .globl glConvolutionParameteriEXT
 .type glConvolutionParameteriEXT,#function
 glConvolutionParameteriEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10419,7 +10419,7 @@ glConvolutionParameteriEXT:
 .globl glConvolutionParameterivEXT
 .type glConvolutionParameterivEXT,#function
 glConvolutionParameterivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10440,7 +10440,7 @@ glConvolutionParameterivEXT:
 .globl glCopyConvolutionFilter1DEXT
 .type glCopyConvolutionFilter1DEXT,#function
 glCopyConvolutionFilter1DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10461,7 +10461,7 @@ glCopyConvolutionFilter1DEXT:
 .globl glCopyConvolutionFilter2DEXT
 .type glCopyConvolutionFilter2DEXT,#function
 glCopyConvolutionFilter2DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10482,7 +10482,7 @@ glCopyConvolutionFilter2DEXT:
 .globl glGetConvolutionFilterEXT
 .type glGetConvolutionFilterEXT,#function
 glGetConvolutionFilterEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10503,7 +10503,7 @@ glGetConvolutionFilterEXT:
 .globl glGetConvolutionParameterfvEXT
 .type glGetConvolutionParameterfvEXT,#function
 glGetConvolutionParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10524,7 +10524,7 @@ glGetConvolutionParameterfvEXT:
 .globl glGetConvolutionParameterivEXT
 .type glGetConvolutionParameterivEXT,#function
 glGetConvolutionParameterivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10545,7 +10545,7 @@ glGetConvolutionParameterivEXT:
 .globl glGetSeparableFilterEXT
 .type glGetSeparableFilterEXT,#function
 glGetSeparableFilterEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10566,7 +10566,7 @@ glGetSeparableFilterEXT:
 .globl glSeparableFilter2DEXT
 .type glSeparableFilter2DEXT,#function
 glSeparableFilter2DEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10587,7 +10587,7 @@ glSeparableFilter2DEXT:
 .globl glColorTableSGI
 .type glColorTableSGI,#function
 glColorTableSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10608,7 +10608,7 @@ glColorTableSGI:
 .globl glColorTableParameterfvSGI
 .type glColorTableParameterfvSGI,#function
 glColorTableParameterfvSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10629,7 +10629,7 @@ glColorTableParameterfvSGI:
 .globl glColorTableParameterivSGI
 .type glColorTableParameterivSGI,#function
 glColorTableParameterivSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10650,7 +10650,7 @@ glColorTableParameterivSGI:
 .globl glCopyColorTableSGI
 .type glCopyColorTableSGI,#function
 glCopyColorTableSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10671,7 +10671,7 @@ glCopyColorTableSGI:
 .globl glGetColorTableSGI
 .type glGetColorTableSGI,#function
 glGetColorTableSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10692,7 +10692,7 @@ glGetColorTableSGI:
 .globl glGetColorTableParameterfvSGI
 .type glGetColorTableParameterfvSGI,#function
 glGetColorTableParameterfvSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10713,7 +10713,7 @@ glGetColorTableParameterfvSGI:
 .globl glGetColorTableParameterivSGI
 .type glGetColorTableParameterivSGI,#function
 glGetColorTableParameterivSGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10734,7 +10734,7 @@ glGetColorTableParameterivSGI:
 .globl glPixelTexGenSGIX
 .type glPixelTexGenSGIX,#function
 glPixelTexGenSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10755,7 +10755,7 @@ glPixelTexGenSGIX:
 .globl glPixelTexGenParameteriSGIS
 .type glPixelTexGenParameteriSGIS,#function
 glPixelTexGenParameteriSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10776,7 +10776,7 @@ glPixelTexGenParameteriSGIS:
 .globl glPixelTexGenParameterivSGIS
 .type glPixelTexGenParameterivSGIS,#function
 glPixelTexGenParameterivSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10797,7 +10797,7 @@ glPixelTexGenParameterivSGIS:
 .globl glPixelTexGenParameterfSGIS
 .type glPixelTexGenParameterfSGIS,#function
 glPixelTexGenParameterfSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10818,7 +10818,7 @@ glPixelTexGenParameterfSGIS:
 .globl glPixelTexGenParameterfvSGIS
 .type glPixelTexGenParameterfvSGIS,#function
 glPixelTexGenParameterfvSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10839,7 +10839,7 @@ glPixelTexGenParameterfvSGIS:
 .globl glGetPixelTexGenParameterivSGIS
 .type glGetPixelTexGenParameterivSGIS,#function
 glGetPixelTexGenParameterivSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10860,7 +10860,7 @@ glGetPixelTexGenParameterivSGIS:
 .globl glGetPixelTexGenParameterfvSGIS
 .type glGetPixelTexGenParameterfvSGIS,#function
 glGetPixelTexGenParameterfvSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10881,7 +10881,7 @@ glGetPixelTexGenParameterfvSGIS:
 .globl glTexImage4DSGIS
 .type glTexImage4DSGIS,#function
 glTexImage4DSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10902,7 +10902,7 @@ glTexImage4DSGIS:
 .globl glTexSubImage4DSGIS
 .type glTexSubImage4DSGIS,#function
 glTexSubImage4DSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10923,7 +10923,7 @@ glTexSubImage4DSGIS:
 .globl glAreTexturesResidentEXT
 .type glAreTexturesResidentEXT,#function
 glAreTexturesResidentEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10944,7 +10944,7 @@ glAreTexturesResidentEXT:
 .globl glBindTextureEXT
 .type glBindTextureEXT,#function
 glBindTextureEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10965,7 +10965,7 @@ glBindTextureEXT:
 .globl glDeleteTexturesEXT
 .type glDeleteTexturesEXT,#function
 glDeleteTexturesEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -10986,7 +10986,7 @@ glDeleteTexturesEXT:
 .globl glGenTexturesEXT
 .type glGenTexturesEXT,#function
 glGenTexturesEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11007,7 +11007,7 @@ glGenTexturesEXT:
 .globl glIsTextureEXT
 .type glIsTextureEXT,#function
 glIsTextureEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11028,7 +11028,7 @@ glIsTextureEXT:
 .globl glPrioritizeTexturesEXT
 .type glPrioritizeTexturesEXT,#function
 glPrioritizeTexturesEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11049,7 +11049,7 @@ glPrioritizeTexturesEXT:
 .globl glDetailTexFuncSGIS
 .type glDetailTexFuncSGIS,#function
 glDetailTexFuncSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11070,7 +11070,7 @@ glDetailTexFuncSGIS:
 .globl glGetDetailTexFuncSGIS
 .type glGetDetailTexFuncSGIS,#function
 glGetDetailTexFuncSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11091,7 +11091,7 @@ glGetDetailTexFuncSGIS:
 .globl glSharpenTexFuncSGIS
 .type glSharpenTexFuncSGIS,#function
 glSharpenTexFuncSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11112,7 +11112,7 @@ glSharpenTexFuncSGIS:
 .globl glGetSharpenTexFuncSGIS
 .type glGetSharpenTexFuncSGIS,#function
 glGetSharpenTexFuncSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11133,7 +11133,7 @@ glGetSharpenTexFuncSGIS:
 .globl glSampleMaskSGIS
 .type glSampleMaskSGIS,#function
 glSampleMaskSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11154,7 +11154,7 @@ glSampleMaskSGIS:
 .globl glSamplePatternSGIS
 .type glSamplePatternSGIS,#function
 glSamplePatternSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11175,7 +11175,7 @@ glSamplePatternSGIS:
 .globl glArrayElementEXT
 .type glArrayElementEXT,#function
 glArrayElementEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11196,7 +11196,7 @@ glArrayElementEXT:
 .globl glColorPointerEXT
 .type glColorPointerEXT,#function
 glColorPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11217,7 +11217,7 @@ glColorPointerEXT:
 .globl glDrawArraysEXT
 .type glDrawArraysEXT,#function
 glDrawArraysEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11238,7 +11238,7 @@ glDrawArraysEXT:
 .globl glEdgeFlagPointerEXT
 .type glEdgeFlagPointerEXT,#function
 glEdgeFlagPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11259,7 +11259,7 @@ glEdgeFlagPointerEXT:
 .globl glGetPointervEXT
 .type glGetPointervEXT,#function
 glGetPointervEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11280,7 +11280,7 @@ glGetPointervEXT:
 .globl glIndexPointerEXT
 .type glIndexPointerEXT,#function
 glIndexPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11301,7 +11301,7 @@ glIndexPointerEXT:
 .globl glNormalPointerEXT
 .type glNormalPointerEXT,#function
 glNormalPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11322,7 +11322,7 @@ glNormalPointerEXT:
 .globl glTexCoordPointerEXT
 .type glTexCoordPointerEXT,#function
 glTexCoordPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11343,7 +11343,7 @@ glTexCoordPointerEXT:
 .globl glVertexPointerEXT
 .type glVertexPointerEXT,#function
 glVertexPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11364,7 +11364,7 @@ glVertexPointerEXT:
 .globl glBlendEquationEXT
 .type glBlendEquationEXT,#function
 glBlendEquationEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11385,7 +11385,7 @@ glBlendEquationEXT:
 .globl glSpriteParameterfSGIX
 .type glSpriteParameterfSGIX,#function
 glSpriteParameterfSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11406,7 +11406,7 @@ glSpriteParameterfSGIX:
 .globl glSpriteParameterfvSGIX
 .type glSpriteParameterfvSGIX,#function
 glSpriteParameterfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11427,7 +11427,7 @@ glSpriteParameterfvSGIX:
 .globl glSpriteParameteriSGIX
 .type glSpriteParameteriSGIX,#function
 glSpriteParameteriSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11448,7 +11448,7 @@ glSpriteParameteriSGIX:
 .globl glSpriteParameterivSGIX
 .type glSpriteParameterivSGIX,#function
 glSpriteParameterivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11469,7 +11469,7 @@ glSpriteParameterivSGIX:
 .globl glPointParameterfEXT
 .type glPointParameterfEXT,#function
 glPointParameterfEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11490,7 +11490,7 @@ glPointParameterfEXT:
 .globl glPointParameterfvEXT
 .type glPointParameterfvEXT,#function
 glPointParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11511,7 +11511,7 @@ glPointParameterfvEXT:
 .globl glPointParameterfARB
 .type glPointParameterfARB,#function
 glPointParameterfARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11532,7 +11532,7 @@ glPointParameterfARB:
 .globl glPointParameterfvARB
 .type glPointParameterfvARB,#function
 glPointParameterfvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11553,7 +11553,7 @@ glPointParameterfvARB:
 .globl glPointParameterfSGIS
 .type glPointParameterfSGIS,#function
 glPointParameterfSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11574,7 +11574,7 @@ glPointParameterfSGIS:
 .globl glPointParameterfvSGIS
 .type glPointParameterfvSGIS,#function
 glPointParameterfvSGIS:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11595,7 +11595,7 @@ glPointParameterfvSGIS:
 .globl glGetInstrumentsSGIX
 .type glGetInstrumentsSGIX,#function
 glGetInstrumentsSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11616,7 +11616,7 @@ glGetInstrumentsSGIX:
 .globl glInstrumentsBufferSGIX
 .type glInstrumentsBufferSGIX,#function
 glInstrumentsBufferSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11637,7 +11637,7 @@ glInstrumentsBufferSGIX:
 .globl glPollInstrumentsSGIX
 .type glPollInstrumentsSGIX,#function
 glPollInstrumentsSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11658,7 +11658,7 @@ glPollInstrumentsSGIX:
 .globl glReadInstrumentsSGIX
 .type glReadInstrumentsSGIX,#function
 glReadInstrumentsSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11679,7 +11679,7 @@ glReadInstrumentsSGIX:
 .globl glStartInstrumentsSGIX
 .type glStartInstrumentsSGIX,#function
 glStartInstrumentsSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11700,7 +11700,7 @@ glStartInstrumentsSGIX:
 .globl glStopInstrumentsSGIX
 .type glStopInstrumentsSGIX,#function
 glStopInstrumentsSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11721,7 +11721,7 @@ glStopInstrumentsSGIX:
 .globl glFrameZoomSGIX
 .type glFrameZoomSGIX,#function
 glFrameZoomSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11742,7 +11742,7 @@ glFrameZoomSGIX:
 .globl glTagSampleBufferSGIX
 .type glTagSampleBufferSGIX,#function
 glTagSampleBufferSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11763,7 +11763,7 @@ glTagSampleBufferSGIX:
 .globl glReferencePlaneSGIX
 .type glReferencePlaneSGIX,#function
 glReferencePlaneSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11784,7 +11784,7 @@ glReferencePlaneSGIX:
 .globl glFlushRasterSGIX
 .type glFlushRasterSGIX,#function
 glFlushRasterSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11805,7 +11805,7 @@ glFlushRasterSGIX:
 .globl glColorSubTableEXT
 .type glColorSubTableEXT,#function
 glColorSubTableEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11826,7 +11826,7 @@ glColorSubTableEXT:
 .globl glCopyColorSubTableEXT
 .type glCopyColorSubTableEXT,#function
 glCopyColorSubTableEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11847,7 +11847,7 @@ glCopyColorSubTableEXT:
 .globl glHintPGI
 .type glHintPGI,#function
 glHintPGI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11868,7 +11868,7 @@ glHintPGI:
 .globl glColorTableEXT
 .type glColorTableEXT,#function
 glColorTableEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11889,7 +11889,7 @@ glColorTableEXT:
 .globl glGetColorTableEXT
 .type glGetColorTableEXT,#function
 glGetColorTableEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11910,7 +11910,7 @@ glGetColorTableEXT:
 .globl glGetColorTableParameterivEXT
 .type glGetColorTableParameterivEXT,#function
 glGetColorTableParameterivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11931,7 +11931,7 @@ glGetColorTableParameterivEXT:
 .globl glGetColorTableParameterfvEXT
 .type glGetColorTableParameterfvEXT,#function
 glGetColorTableParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11952,7 +11952,7 @@ glGetColorTableParameterfvEXT:
 .globl glGetListParameterfvSGIX
 .type glGetListParameterfvSGIX,#function
 glGetListParameterfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11973,7 +11973,7 @@ glGetListParameterfvSGIX:
 .globl glGetListParameterivSGIX
 .type glGetListParameterivSGIX,#function
 glGetListParameterivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -11994,7 +11994,7 @@ glGetListParameterivSGIX:
 .globl glListParameterfSGIX
 .type glListParameterfSGIX,#function
 glListParameterfSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12015,7 +12015,7 @@ glListParameterfSGIX:
 .globl glListParameterfvSGIX
 .type glListParameterfvSGIX,#function
 glListParameterfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12036,7 +12036,7 @@ glListParameterfvSGIX:
 .globl glListParameteriSGIX
 .type glListParameteriSGIX,#function
 glListParameteriSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12057,7 +12057,7 @@ glListParameteriSGIX:
 .globl glListParameterivSGIX
 .type glListParameterivSGIX,#function
 glListParameterivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12078,7 +12078,7 @@ glListParameterivSGIX:
 .globl glIndexMaterialEXT
 .type glIndexMaterialEXT,#function
 glIndexMaterialEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12099,7 +12099,7 @@ glIndexMaterialEXT:
 .globl glIndexFuncEXT
 .type glIndexFuncEXT,#function
 glIndexFuncEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12120,7 +12120,7 @@ glIndexFuncEXT:
 .globl glLockArraysEXT
 .type glLockArraysEXT,#function
 glLockArraysEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12141,7 +12141,7 @@ glLockArraysEXT:
 .globl glUnlockArraysEXT
 .type glUnlockArraysEXT,#function
 glUnlockArraysEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12162,7 +12162,7 @@ glUnlockArraysEXT:
 .globl glCullParameterdvEXT
 .type glCullParameterdvEXT,#function
 glCullParameterdvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12183,7 +12183,7 @@ glCullParameterdvEXT:
 .globl glCullParameterfvEXT
 .type glCullParameterfvEXT,#function
 glCullParameterfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12204,7 +12204,7 @@ glCullParameterfvEXT:
 .globl glFragmentColorMaterialSGIX
 .type glFragmentColorMaterialSGIX,#function
 glFragmentColorMaterialSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12225,7 +12225,7 @@ glFragmentColorMaterialSGIX:
 .globl glFragmentLightfSGIX
 .type glFragmentLightfSGIX,#function
 glFragmentLightfSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12246,7 +12246,7 @@ glFragmentLightfSGIX:
 .globl glFragmentLightfvSGIX
 .type glFragmentLightfvSGIX,#function
 glFragmentLightfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12267,7 +12267,7 @@ glFragmentLightfvSGIX:
 .globl glFragmentLightiSGIX
 .type glFragmentLightiSGIX,#function
 glFragmentLightiSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12288,7 +12288,7 @@ glFragmentLightiSGIX:
 .globl glFragmentLightivSGIX
 .type glFragmentLightivSGIX,#function
 glFragmentLightivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12309,7 +12309,7 @@ glFragmentLightivSGIX:
 .globl glFragmentLightModelfSGIX
 .type glFragmentLightModelfSGIX,#function
 glFragmentLightModelfSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12330,7 +12330,7 @@ glFragmentLightModelfSGIX:
 .globl glFragmentLightModelfvSGIX
 .type glFragmentLightModelfvSGIX,#function
 glFragmentLightModelfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12351,7 +12351,7 @@ glFragmentLightModelfvSGIX:
 .globl glFragmentLightModeliSGIX
 .type glFragmentLightModeliSGIX,#function
 glFragmentLightModeliSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12372,7 +12372,7 @@ glFragmentLightModeliSGIX:
 .globl glFragmentLightModelivSGIX
 .type glFragmentLightModelivSGIX,#function
 glFragmentLightModelivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12393,7 +12393,7 @@ glFragmentLightModelivSGIX:
 .globl glFragmentMaterialfSGIX
 .type glFragmentMaterialfSGIX,#function
 glFragmentMaterialfSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12414,7 +12414,7 @@ glFragmentMaterialfSGIX:
 .globl glFragmentMaterialfvSGIX
 .type glFragmentMaterialfvSGIX,#function
 glFragmentMaterialfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12435,7 +12435,7 @@ glFragmentMaterialfvSGIX:
 .globl glFragmentMaterialiSGIX
 .type glFragmentMaterialiSGIX,#function
 glFragmentMaterialiSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12456,7 +12456,7 @@ glFragmentMaterialiSGIX:
 .globl glFragmentMaterialivSGIX
 .type glFragmentMaterialivSGIX,#function
 glFragmentMaterialivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12477,7 +12477,7 @@ glFragmentMaterialivSGIX:
 .globl glGetFragmentLightfvSGIX
 .type glGetFragmentLightfvSGIX,#function
 glGetFragmentLightfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12498,7 +12498,7 @@ glGetFragmentLightfvSGIX:
 .globl glGetFragmentLightivSGIX
 .type glGetFragmentLightivSGIX,#function
 glGetFragmentLightivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12519,7 +12519,7 @@ glGetFragmentLightivSGIX:
 .globl glGetFragmentMaterialfvSGIX
 .type glGetFragmentMaterialfvSGIX,#function
 glGetFragmentMaterialfvSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12540,7 +12540,7 @@ glGetFragmentMaterialfvSGIX:
 .globl glGetFragmentMaterialivSGIX
 .type glGetFragmentMaterialivSGIX,#function
 glGetFragmentMaterialivSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12561,7 +12561,7 @@ glGetFragmentMaterialivSGIX:
 .globl glLightEnviSGIX
 .type glLightEnviSGIX,#function
 glLightEnviSGIX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12582,7 +12582,7 @@ glLightEnviSGIX:
 .globl glDrawRangeElementsEXT
 .type glDrawRangeElementsEXT,#function
 glDrawRangeElementsEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12603,7 +12603,7 @@ glDrawRangeElementsEXT:
 .globl glSecondaryColor3bEXT
 .type glSecondaryColor3bEXT,#function
 glSecondaryColor3bEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12624,7 +12624,7 @@ glSecondaryColor3bEXT:
 .globl glSecondaryColor3bvEXT
 .type glSecondaryColor3bvEXT,#function
 glSecondaryColor3bvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12645,7 +12645,7 @@ glSecondaryColor3bvEXT:
 .globl glSecondaryColor3dEXT
 .type glSecondaryColor3dEXT,#function
 glSecondaryColor3dEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12666,7 +12666,7 @@ glSecondaryColor3dEXT:
 .globl glSecondaryColor3dvEXT
 .type glSecondaryColor3dvEXT,#function
 glSecondaryColor3dvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12687,7 +12687,7 @@ glSecondaryColor3dvEXT:
 .globl glSecondaryColor3fEXT
 .type glSecondaryColor3fEXT,#function
 glSecondaryColor3fEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12708,7 +12708,7 @@ glSecondaryColor3fEXT:
 .globl glSecondaryColor3fvEXT
 .type glSecondaryColor3fvEXT,#function
 glSecondaryColor3fvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12729,7 +12729,7 @@ glSecondaryColor3fvEXT:
 .globl glSecondaryColor3iEXT
 .type glSecondaryColor3iEXT,#function
 glSecondaryColor3iEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12750,7 +12750,7 @@ glSecondaryColor3iEXT:
 .globl glSecondaryColor3ivEXT
 .type glSecondaryColor3ivEXT,#function
 glSecondaryColor3ivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12771,7 +12771,7 @@ glSecondaryColor3ivEXT:
 .globl glSecondaryColor3sEXT
 .type glSecondaryColor3sEXT,#function
 glSecondaryColor3sEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12792,7 +12792,7 @@ glSecondaryColor3sEXT:
 .globl glSecondaryColor3svEXT
 .type glSecondaryColor3svEXT,#function
 glSecondaryColor3svEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12813,7 +12813,7 @@ glSecondaryColor3svEXT:
 .globl glSecondaryColor3ubEXT
 .type glSecondaryColor3ubEXT,#function
 glSecondaryColor3ubEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12834,7 +12834,7 @@ glSecondaryColor3ubEXT:
 .globl glSecondaryColor3ubvEXT
 .type glSecondaryColor3ubvEXT,#function
 glSecondaryColor3ubvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12855,7 +12855,7 @@ glSecondaryColor3ubvEXT:
 .globl glSecondaryColor3uiEXT
 .type glSecondaryColor3uiEXT,#function
 glSecondaryColor3uiEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12876,7 +12876,7 @@ glSecondaryColor3uiEXT:
 .globl glSecondaryColor3uivEXT
 .type glSecondaryColor3uivEXT,#function
 glSecondaryColor3uivEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12897,7 +12897,7 @@ glSecondaryColor3uivEXT:
 .globl glSecondaryColor3usEXT
 .type glSecondaryColor3usEXT,#function
 glSecondaryColor3usEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12918,7 +12918,7 @@ glSecondaryColor3usEXT:
 .globl glSecondaryColor3usvEXT
 .type glSecondaryColor3usvEXT,#function
 glSecondaryColor3usvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12939,7 +12939,7 @@ glSecondaryColor3usvEXT:
 .globl glSecondaryColorPointerEXT
 .type glSecondaryColorPointerEXT,#function
 glSecondaryColorPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12960,7 +12960,7 @@ glSecondaryColorPointerEXT:
 .globl glMultiDrawArraysEXT
 .type glMultiDrawArraysEXT,#function
 glMultiDrawArraysEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -12981,7 +12981,7 @@ glMultiDrawArraysEXT:
 .globl glMultiDrawElementsEXT
 .type glMultiDrawElementsEXT,#function
 glMultiDrawElementsEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13002,7 +13002,7 @@ glMultiDrawElementsEXT:
 .globl glFogCoordfEXT
 .type glFogCoordfEXT,#function
 glFogCoordfEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13023,7 +13023,7 @@ glFogCoordfEXT:
 .globl glFogCoordfvEXT
 .type glFogCoordfvEXT,#function
 glFogCoordfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13044,7 +13044,7 @@ glFogCoordfvEXT:
 .globl glFogCoorddEXT
 .type glFogCoorddEXT,#function
 glFogCoorddEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13065,7 +13065,7 @@ glFogCoorddEXT:
 .globl glFogCoorddvEXT
 .type glFogCoorddvEXT,#function
 glFogCoorddvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13086,7 +13086,7 @@ glFogCoorddvEXT:
 .globl glFogCoordPointerEXT
 .type glFogCoordPointerEXT,#function
 glFogCoordPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13107,7 +13107,7 @@ glFogCoordPointerEXT:
 .globl glBlendFuncSeparateEXT
 .type glBlendFuncSeparateEXT,#function
 glBlendFuncSeparateEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13128,7 +13128,7 @@ glBlendFuncSeparateEXT:
 .globl glBlendFuncSeparateINGR
 .type glBlendFuncSeparateINGR,#function
 glBlendFuncSeparateINGR:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13149,7 +13149,7 @@ glBlendFuncSeparateINGR:
 .globl glVertexWeightfEXT
 .type glVertexWeightfEXT,#function
 glVertexWeightfEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13170,7 +13170,7 @@ glVertexWeightfEXT:
 .globl glVertexWeightfvEXT
 .type glVertexWeightfvEXT,#function
 glVertexWeightfvEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13191,7 +13191,7 @@ glVertexWeightfvEXT:
 .globl glVertexWeightPointerEXT
 .type glVertexWeightPointerEXT,#function
 glVertexWeightPointerEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13212,7 +13212,7 @@ glVertexWeightPointerEXT:
 .globl glFlushVertexArrayRangeNV
 .type glFlushVertexArrayRangeNV,#function
 glFlushVertexArrayRangeNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13233,7 +13233,7 @@ glFlushVertexArrayRangeNV:
 .globl glVertexArrayRangeNV
 .type glVertexArrayRangeNV,#function
 glVertexArrayRangeNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13254,7 +13254,7 @@ glVertexArrayRangeNV:
 .globl glCombinerParameterfvNV
 .type glCombinerParameterfvNV,#function
 glCombinerParameterfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13275,7 +13275,7 @@ glCombinerParameterfvNV:
 .globl glCombinerParameterfNV
 .type glCombinerParameterfNV,#function
 glCombinerParameterfNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13296,7 +13296,7 @@ glCombinerParameterfNV:
 .globl glCombinerParameterivNV
 .type glCombinerParameterivNV,#function
 glCombinerParameterivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13317,7 +13317,7 @@ glCombinerParameterivNV:
 .globl glCombinerParameteriNV
 .type glCombinerParameteriNV,#function
 glCombinerParameteriNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13338,7 +13338,7 @@ glCombinerParameteriNV:
 .globl glCombinerInputNV
 .type glCombinerInputNV,#function
 glCombinerInputNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13359,7 +13359,7 @@ glCombinerInputNV:
 .globl glCombinerOutputNV
 .type glCombinerOutputNV,#function
 glCombinerOutputNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13380,7 +13380,7 @@ glCombinerOutputNV:
 .globl glFinalCombinerInputNV
 .type glFinalCombinerInputNV,#function
 glFinalCombinerInputNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13401,7 +13401,7 @@ glFinalCombinerInputNV:
 .globl glGetCombinerInputParameterfvNV
 .type glGetCombinerInputParameterfvNV,#function
 glGetCombinerInputParameterfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13422,7 +13422,7 @@ glGetCombinerInputParameterfvNV:
 .globl glGetCombinerInputParameterivNV
 .type glGetCombinerInputParameterivNV,#function
 glGetCombinerInputParameterivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13443,7 +13443,7 @@ glGetCombinerInputParameterivNV:
 .globl glGetCombinerOutputParameterfvNV
 .type glGetCombinerOutputParameterfvNV,#function
 glGetCombinerOutputParameterfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13464,7 +13464,7 @@ glGetCombinerOutputParameterfvNV:
 .globl glGetCombinerOutputParameterivNV
 .type glGetCombinerOutputParameterivNV,#function
 glGetCombinerOutputParameterivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13485,7 +13485,7 @@ glGetCombinerOutputParameterivNV:
 .globl glGetFinalCombinerInputParameterfvNV
 .type glGetFinalCombinerInputParameterfvNV,#function
 glGetFinalCombinerInputParameterfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13506,7 +13506,7 @@ glGetFinalCombinerInputParameterfvNV:
 .globl glGetFinalCombinerInputParameterivNV
 .type glGetFinalCombinerInputParameterivNV,#function
 glGetFinalCombinerInputParameterivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13527,7 +13527,7 @@ glGetFinalCombinerInputParameterivNV:
 .globl glResizeBuffersMESA
 .type glResizeBuffersMESA,#function
 glResizeBuffersMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13548,7 +13548,7 @@ glResizeBuffersMESA:
 .globl glWindowPos2dMESA
 .type glWindowPos2dMESA,#function
 glWindowPos2dMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13569,7 +13569,7 @@ glWindowPos2dMESA:
 .globl glWindowPos2dvMESA
 .type glWindowPos2dvMESA,#function
 glWindowPos2dvMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13590,7 +13590,7 @@ glWindowPos2dvMESA:
 .globl glWindowPos2fMESA
 .type glWindowPos2fMESA,#function
 glWindowPos2fMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13611,7 +13611,7 @@ glWindowPos2fMESA:
 .globl glWindowPos2fvMESA
 .type glWindowPos2fvMESA,#function
 glWindowPos2fvMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13632,7 +13632,7 @@ glWindowPos2fvMESA:
 .globl glWindowPos2iMESA
 .type glWindowPos2iMESA,#function
 glWindowPos2iMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13653,7 +13653,7 @@ glWindowPos2iMESA:
 .globl glWindowPos2ivMESA
 .type glWindowPos2ivMESA,#function
 glWindowPos2ivMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13674,7 +13674,7 @@ glWindowPos2ivMESA:
 .globl glWindowPos2sMESA
 .type glWindowPos2sMESA,#function
 glWindowPos2sMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13695,7 +13695,7 @@ glWindowPos2sMESA:
 .globl glWindowPos2svMESA
 .type glWindowPos2svMESA,#function
 glWindowPos2svMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13716,7 +13716,7 @@ glWindowPos2svMESA:
 .globl glWindowPos3dMESA
 .type glWindowPos3dMESA,#function
 glWindowPos3dMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13737,7 +13737,7 @@ glWindowPos3dMESA:
 .globl glWindowPos3dvMESA
 .type glWindowPos3dvMESA,#function
 glWindowPos3dvMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13758,7 +13758,7 @@ glWindowPos3dvMESA:
 .globl glWindowPos3fMESA
 .type glWindowPos3fMESA,#function
 glWindowPos3fMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13779,7 +13779,7 @@ glWindowPos3fMESA:
 .globl glWindowPos3fvMESA
 .type glWindowPos3fvMESA,#function
 glWindowPos3fvMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13800,7 +13800,7 @@ glWindowPos3fvMESA:
 .globl glWindowPos3iMESA
 .type glWindowPos3iMESA,#function
 glWindowPos3iMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13821,7 +13821,7 @@ glWindowPos3iMESA:
 .globl glWindowPos3ivMESA
 .type glWindowPos3ivMESA,#function
 glWindowPos3ivMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13842,7 +13842,7 @@ glWindowPos3ivMESA:
 .globl glWindowPos3sMESA
 .type glWindowPos3sMESA,#function
 glWindowPos3sMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13863,7 +13863,7 @@ glWindowPos3sMESA:
 .globl glWindowPos3svMESA
 .type glWindowPos3svMESA,#function
 glWindowPos3svMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13884,7 +13884,7 @@ glWindowPos3svMESA:
 .globl glWindowPos4dMESA
 .type glWindowPos4dMESA,#function
 glWindowPos4dMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13905,7 +13905,7 @@ glWindowPos4dMESA:
 .globl glWindowPos4dvMESA
 .type glWindowPos4dvMESA,#function
 glWindowPos4dvMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13926,7 +13926,7 @@ glWindowPos4dvMESA:
 .globl glWindowPos4fMESA
 .type glWindowPos4fMESA,#function
 glWindowPos4fMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13947,7 +13947,7 @@ glWindowPos4fMESA:
 .globl glWindowPos4fvMESA
 .type glWindowPos4fvMESA,#function
 glWindowPos4fvMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13968,7 +13968,7 @@ glWindowPos4fvMESA:
 .globl glWindowPos4iMESA
 .type glWindowPos4iMESA,#function
 glWindowPos4iMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -13989,7 +13989,7 @@ glWindowPos4iMESA:
 .globl glWindowPos4ivMESA
 .type glWindowPos4ivMESA,#function
 glWindowPos4ivMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14010,7 +14010,7 @@ glWindowPos4ivMESA:
 .globl glWindowPos4sMESA
 .type glWindowPos4sMESA,#function
 glWindowPos4sMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14031,7 +14031,7 @@ glWindowPos4sMESA:
 .globl glWindowPos4svMESA
 .type glWindowPos4svMESA,#function
 glWindowPos4svMESA:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14052,7 +14052,7 @@ glWindowPos4svMESA:
 .globl glMultiModeDrawArraysIBM
 .type glMultiModeDrawArraysIBM,#function
 glMultiModeDrawArraysIBM:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14073,7 +14073,7 @@ glMultiModeDrawArraysIBM:
 .globl glMultiModeDrawElementsIBM
 .type glMultiModeDrawElementsIBM,#function
 glMultiModeDrawElementsIBM:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14094,7 +14094,7 @@ glMultiModeDrawElementsIBM:
 .globl glTbufferMask3DFX
 .type glTbufferMask3DFX,#function
 glTbufferMask3DFX:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14115,7 +14115,7 @@ glTbufferMask3DFX:
 .globl glSampleMaskEXT
 .type glSampleMaskEXT,#function
 glSampleMaskEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14136,7 +14136,7 @@ glSampleMaskEXT:
 .globl glSamplePatternEXT
 .type glSamplePatternEXT,#function
 glSamplePatternEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14157,7 +14157,7 @@ glSamplePatternEXT:
 .globl glWindowPos2dARB
 .type glWindowPos2dARB,#function
 glWindowPos2dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14178,7 +14178,7 @@ glWindowPos2dARB:
 .globl glWindowPos2fARB
 .type glWindowPos2fARB,#function
 glWindowPos2fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14199,7 +14199,7 @@ glWindowPos2fARB:
 .globl glWindowPos2iARB
 .type glWindowPos2iARB,#function
 glWindowPos2iARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14220,7 +14220,7 @@ glWindowPos2iARB:
 .globl glWindowPos2sARB
 .type glWindowPos2sARB,#function
 glWindowPos2sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14241,7 +14241,7 @@ glWindowPos2sARB:
 .globl glWindowPos2dvARB
 .type glWindowPos2dvARB,#function
 glWindowPos2dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14262,7 +14262,7 @@ glWindowPos2dvARB:
 .globl glWindowPos2fvARB
 .type glWindowPos2fvARB,#function
 glWindowPos2fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14283,7 +14283,7 @@ glWindowPos2fvARB:
 .globl glWindowPos2ivARB
 .type glWindowPos2ivARB,#function
 glWindowPos2ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14304,7 +14304,7 @@ glWindowPos2ivARB:
 .globl glWindowPos2svARB
 .type glWindowPos2svARB,#function
 glWindowPos2svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14325,7 +14325,7 @@ glWindowPos2svARB:
 .globl glWindowPos3dARB
 .type glWindowPos3dARB,#function
 glWindowPos3dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14346,7 +14346,7 @@ glWindowPos3dARB:
 .globl glWindowPos3fARB
 .type glWindowPos3fARB,#function
 glWindowPos3fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14367,7 +14367,7 @@ glWindowPos3fARB:
 .globl glWindowPos3iARB
 .type glWindowPos3iARB,#function
 glWindowPos3iARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14388,7 +14388,7 @@ glWindowPos3iARB:
 .globl glWindowPos3sARB
 .type glWindowPos3sARB,#function
 glWindowPos3sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14409,7 +14409,7 @@ glWindowPos3sARB:
 .globl glWindowPos3dvARB
 .type glWindowPos3dvARB,#function
 glWindowPos3dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14430,7 +14430,7 @@ glWindowPos3dvARB:
 .globl glWindowPos3fvARB
 .type glWindowPos3fvARB,#function
 glWindowPos3fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14451,7 +14451,7 @@ glWindowPos3fvARB:
 .globl glWindowPos3ivARB
 .type glWindowPos3ivARB,#function
 glWindowPos3ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14472,7 +14472,7 @@ glWindowPos3ivARB:
 .globl glWindowPos3svARB
 .type glWindowPos3svARB,#function
 glWindowPos3svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14493,7 +14493,7 @@ glWindowPos3svARB:
 .globl glAreProgramsResidentNV
 .type glAreProgramsResidentNV,#function
 glAreProgramsResidentNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14514,7 +14514,7 @@ glAreProgramsResidentNV:
 .globl glBindProgramNV
 .type glBindProgramNV,#function
 glBindProgramNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14535,7 +14535,7 @@ glBindProgramNV:
 .globl glDeleteProgramsNV
 .type glDeleteProgramsNV,#function
 glDeleteProgramsNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14556,7 +14556,7 @@ glDeleteProgramsNV:
 .globl glExecuteProgramNV
 .type glExecuteProgramNV,#function
 glExecuteProgramNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14577,7 +14577,7 @@ glExecuteProgramNV:
 .globl glGenProgramsNV
 .type glGenProgramsNV,#function
 glGenProgramsNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14598,7 +14598,7 @@ glGenProgramsNV:
 .globl glGetProgramParameterdvNV
 .type glGetProgramParameterdvNV,#function
 glGetProgramParameterdvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14619,7 +14619,7 @@ glGetProgramParameterdvNV:
 .globl glGetProgramParameterfvNV
 .type glGetProgramParameterfvNV,#function
 glGetProgramParameterfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14640,7 +14640,7 @@ glGetProgramParameterfvNV:
 .globl glGetProgramivNV
 .type glGetProgramivNV,#function
 glGetProgramivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14661,7 +14661,7 @@ glGetProgramivNV:
 .globl glGetProgramStringNV
 .type glGetProgramStringNV,#function
 glGetProgramStringNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14682,7 +14682,7 @@ glGetProgramStringNV:
 .globl glGetTrackMatrixivNV
 .type glGetTrackMatrixivNV,#function
 glGetTrackMatrixivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14703,7 +14703,7 @@ glGetTrackMatrixivNV:
 .globl glGetVertexAttribdvNV
 .type glGetVertexAttribdvNV,#function
 glGetVertexAttribdvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14724,7 +14724,7 @@ glGetVertexAttribdvNV:
 .globl glGetVertexAttribfvNV
 .type glGetVertexAttribfvNV,#function
 glGetVertexAttribfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14745,7 +14745,7 @@ glGetVertexAttribfvNV:
 .globl glGetVertexAttribivNV
 .type glGetVertexAttribivNV,#function
 glGetVertexAttribivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14766,7 +14766,7 @@ glGetVertexAttribivNV:
 .globl glGetVertexAttribPointervNV
 .type glGetVertexAttribPointervNV,#function
 glGetVertexAttribPointervNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14787,7 +14787,7 @@ glGetVertexAttribPointervNV:
 .globl glIsProgramNV
 .type glIsProgramNV,#function
 glIsProgramNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14808,7 +14808,7 @@ glIsProgramNV:
 .globl glLoadProgramNV
 .type glLoadProgramNV,#function
 glLoadProgramNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14829,7 +14829,7 @@ glLoadProgramNV:
 .globl glProgramParameter4dNV
 .type glProgramParameter4dNV,#function
 glProgramParameter4dNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14850,7 +14850,7 @@ glProgramParameter4dNV:
 .globl glProgramParameter4dvNV
 .type glProgramParameter4dvNV,#function
 glProgramParameter4dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14871,7 +14871,7 @@ glProgramParameter4dvNV:
 .globl glProgramParameter4fNV
 .type glProgramParameter4fNV,#function
 glProgramParameter4fNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14892,7 +14892,7 @@ glProgramParameter4fNV:
 .globl glProgramParameter4fvNV
 .type glProgramParameter4fvNV,#function
 glProgramParameter4fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14913,7 +14913,7 @@ glProgramParameter4fvNV:
 .globl glProgramParameters4dvNV
 .type glProgramParameters4dvNV,#function
 glProgramParameters4dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14934,7 +14934,7 @@ glProgramParameters4dvNV:
 .globl glProgramParameters4fvNV
 .type glProgramParameters4fvNV,#function
 glProgramParameters4fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14955,7 +14955,7 @@ glProgramParameters4fvNV:
 .globl glRequestResidentProgramsNV
 .type glRequestResidentProgramsNV,#function
 glRequestResidentProgramsNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14976,7 +14976,7 @@ glRequestResidentProgramsNV:
 .globl glTrackMatrixNV
 .type glTrackMatrixNV,#function
 glTrackMatrixNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -14997,7 +14997,7 @@ glTrackMatrixNV:
 .globl glVertexAttribPointerNV
 .type glVertexAttribPointerNV,#function
 glVertexAttribPointerNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15018,7 +15018,7 @@ glVertexAttribPointerNV:
 .globl glVertexAttrib1dNV
 .type glVertexAttrib1dNV,#function
 glVertexAttrib1dNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15039,7 +15039,7 @@ glVertexAttrib1dNV:
 .globl glVertexAttrib1dvNV
 .type glVertexAttrib1dvNV,#function
 glVertexAttrib1dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15060,7 +15060,7 @@ glVertexAttrib1dvNV:
 .globl glVertexAttrib1fNV
 .type glVertexAttrib1fNV,#function
 glVertexAttrib1fNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15081,7 +15081,7 @@ glVertexAttrib1fNV:
 .globl glVertexAttrib1fvNV
 .type glVertexAttrib1fvNV,#function
 glVertexAttrib1fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15102,7 +15102,7 @@ glVertexAttrib1fvNV:
 .globl glVertexAttrib1sNV
 .type glVertexAttrib1sNV,#function
 glVertexAttrib1sNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15123,7 +15123,7 @@ glVertexAttrib1sNV:
 .globl glVertexAttrib1svNV
 .type glVertexAttrib1svNV,#function
 glVertexAttrib1svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15144,7 +15144,7 @@ glVertexAttrib1svNV:
 .globl glVertexAttrib2dNV
 .type glVertexAttrib2dNV,#function
 glVertexAttrib2dNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15165,7 +15165,7 @@ glVertexAttrib2dNV:
 .globl glVertexAttrib2dvNV
 .type glVertexAttrib2dvNV,#function
 glVertexAttrib2dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15186,7 +15186,7 @@ glVertexAttrib2dvNV:
 .globl glVertexAttrib2fNV
 .type glVertexAttrib2fNV,#function
 glVertexAttrib2fNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15207,7 +15207,7 @@ glVertexAttrib2fNV:
 .globl glVertexAttrib2fvNV
 .type glVertexAttrib2fvNV,#function
 glVertexAttrib2fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15228,7 +15228,7 @@ glVertexAttrib2fvNV:
 .globl glVertexAttrib2sNV
 .type glVertexAttrib2sNV,#function
 glVertexAttrib2sNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15249,7 +15249,7 @@ glVertexAttrib2sNV:
 .globl glVertexAttrib2svNV
 .type glVertexAttrib2svNV,#function
 glVertexAttrib2svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15270,7 +15270,7 @@ glVertexAttrib2svNV:
 .globl glVertexAttrib3dNV
 .type glVertexAttrib3dNV,#function
 glVertexAttrib3dNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15291,7 +15291,7 @@ glVertexAttrib3dNV:
 .globl glVertexAttrib3dvNV
 .type glVertexAttrib3dvNV,#function
 glVertexAttrib3dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15312,7 +15312,7 @@ glVertexAttrib3dvNV:
 .globl glVertexAttrib3fNV
 .type glVertexAttrib3fNV,#function
 glVertexAttrib3fNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15333,7 +15333,7 @@ glVertexAttrib3fNV:
 .globl glVertexAttrib3fvNV
 .type glVertexAttrib3fvNV,#function
 glVertexAttrib3fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15354,7 +15354,7 @@ glVertexAttrib3fvNV:
 .globl glVertexAttrib3sNV
 .type glVertexAttrib3sNV,#function
 glVertexAttrib3sNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15375,7 +15375,7 @@ glVertexAttrib3sNV:
 .globl glVertexAttrib3svNV
 .type glVertexAttrib3svNV,#function
 glVertexAttrib3svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15396,7 +15396,7 @@ glVertexAttrib3svNV:
 .globl glVertexAttrib4dNV
 .type glVertexAttrib4dNV,#function
 glVertexAttrib4dNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15417,7 +15417,7 @@ glVertexAttrib4dNV:
 .globl glVertexAttrib4dvNV
 .type glVertexAttrib4dvNV,#function
 glVertexAttrib4dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15438,7 +15438,7 @@ glVertexAttrib4dvNV:
 .globl glVertexAttrib4fNV
 .type glVertexAttrib4fNV,#function
 glVertexAttrib4fNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15459,7 +15459,7 @@ glVertexAttrib4fNV:
 .globl glVertexAttrib4fvNV
 .type glVertexAttrib4fvNV,#function
 glVertexAttrib4fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15480,7 +15480,7 @@ glVertexAttrib4fvNV:
 .globl glVertexAttrib4sNV
 .type glVertexAttrib4sNV,#function
 glVertexAttrib4sNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15501,7 +15501,7 @@ glVertexAttrib4sNV:
 .globl glVertexAttrib4svNV
 .type glVertexAttrib4svNV,#function
 glVertexAttrib4svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15522,7 +15522,7 @@ glVertexAttrib4svNV:
 .globl glVertexAttrib4ubNV
 .type glVertexAttrib4ubNV,#function
 glVertexAttrib4ubNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15543,7 +15543,7 @@ glVertexAttrib4ubNV:
 .globl glVertexAttrib4ubvNV
 .type glVertexAttrib4ubvNV,#function
 glVertexAttrib4ubvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15564,7 +15564,7 @@ glVertexAttrib4ubvNV:
 .globl glVertexAttribs1dvNV
 .type glVertexAttribs1dvNV,#function
 glVertexAttribs1dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15585,7 +15585,7 @@ glVertexAttribs1dvNV:
 .globl glVertexAttribs1fvNV
 .type glVertexAttribs1fvNV,#function
 glVertexAttribs1fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15606,7 +15606,7 @@ glVertexAttribs1fvNV:
 .globl glVertexAttribs1svNV
 .type glVertexAttribs1svNV,#function
 glVertexAttribs1svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15627,7 +15627,7 @@ glVertexAttribs1svNV:
 .globl glVertexAttribs2dvNV
 .type glVertexAttribs2dvNV,#function
 glVertexAttribs2dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15648,7 +15648,7 @@ glVertexAttribs2dvNV:
 .globl glVertexAttribs2fvNV
 .type glVertexAttribs2fvNV,#function
 glVertexAttribs2fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15669,7 +15669,7 @@ glVertexAttribs2fvNV:
 .globl glVertexAttribs2svNV
 .type glVertexAttribs2svNV,#function
 glVertexAttribs2svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15690,7 +15690,7 @@ glVertexAttribs2svNV:
 .globl glVertexAttribs3dvNV
 .type glVertexAttribs3dvNV,#function
 glVertexAttribs3dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15711,7 +15711,7 @@ glVertexAttribs3dvNV:
 .globl glVertexAttribs3fvNV
 .type glVertexAttribs3fvNV,#function
 glVertexAttribs3fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15732,7 +15732,7 @@ glVertexAttribs3fvNV:
 .globl glVertexAttribs3svNV
 .type glVertexAttribs3svNV,#function
 glVertexAttribs3svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15753,7 +15753,7 @@ glVertexAttribs3svNV:
 .globl glVertexAttribs4dvNV
 .type glVertexAttribs4dvNV,#function
 glVertexAttribs4dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15774,7 +15774,7 @@ glVertexAttribs4dvNV:
 .globl glVertexAttribs4fvNV
 .type glVertexAttribs4fvNV,#function
 glVertexAttribs4fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15795,7 +15795,7 @@ glVertexAttribs4fvNV:
 .globl glVertexAttribs4svNV
 .type glVertexAttribs4svNV,#function
 glVertexAttribs4svNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15816,7 +15816,7 @@ glVertexAttribs4svNV:
 .globl glVertexAttribs4ubvNV
 .type glVertexAttribs4ubvNV,#function
 glVertexAttribs4ubvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15837,7 +15837,7 @@ glVertexAttribs4ubvNV:
 .globl glPointParameteriNV
 .type glPointParameteriNV,#function
 glPointParameteriNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15858,7 +15858,7 @@ glPointParameteriNV:
 .globl glPointParameterivNV
 .type glPointParameterivNV,#function
 glPointParameterivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15879,7 +15879,7 @@ glPointParameterivNV:
 .globl glBlendFuncSeparate
 .type glBlendFuncSeparate,#function
 glBlendFuncSeparate:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15900,7 +15900,7 @@ glBlendFuncSeparate:
 .globl glFogCoordf
 .type glFogCoordf,#function
 glFogCoordf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15921,7 +15921,7 @@ glFogCoordf:
 .globl glFogCoordfv
 .type glFogCoordfv,#function
 glFogCoordfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15942,7 +15942,7 @@ glFogCoordfv:
 .globl glFogCoordd
 .type glFogCoordd,#function
 glFogCoordd:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15963,7 +15963,7 @@ glFogCoordd:
 .globl glFogCoorddv
 .type glFogCoorddv,#function
 glFogCoorddv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -15984,7 +15984,7 @@ glFogCoorddv:
 .globl glFogCoordPointer
 .type glFogCoordPointer,#function
 glFogCoordPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16005,7 +16005,7 @@ glFogCoordPointer:
 .globl glMultiDrawArrays
 .type glMultiDrawArrays,#function
 glMultiDrawArrays:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16026,7 +16026,7 @@ glMultiDrawArrays:
 .globl glMultiDrawElements
 .type glMultiDrawElements,#function
 glMultiDrawElements:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16047,7 +16047,7 @@ glMultiDrawElements:
 .globl glPointParameterf
 .type glPointParameterf,#function
 glPointParameterf:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16068,7 +16068,7 @@ glPointParameterf:
 .globl glPointParameterfv
 .type glPointParameterfv,#function
 glPointParameterfv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16089,7 +16089,7 @@ glPointParameterfv:
 .globl glPointParameteri
 .type glPointParameteri,#function
 glPointParameteri:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16110,7 +16110,7 @@ glPointParameteri:
 .globl glPointParameteriv
 .type glPointParameteriv,#function
 glPointParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16131,7 +16131,7 @@ glPointParameteriv:
 .globl glSecondaryColor3b
 .type glSecondaryColor3b,#function
 glSecondaryColor3b:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16152,7 +16152,7 @@ glSecondaryColor3b:
 .globl glSecondaryColor3bv
 .type glSecondaryColor3bv,#function
 glSecondaryColor3bv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16173,7 +16173,7 @@ glSecondaryColor3bv:
 .globl glSecondaryColor3d
 .type glSecondaryColor3d,#function
 glSecondaryColor3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16194,7 +16194,7 @@ glSecondaryColor3d:
 .globl glSecondaryColor3dv
 .type glSecondaryColor3dv,#function
 glSecondaryColor3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16215,7 +16215,7 @@ glSecondaryColor3dv:
 .globl glSecondaryColor3f
 .type glSecondaryColor3f,#function
 glSecondaryColor3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16236,7 +16236,7 @@ glSecondaryColor3f:
 .globl glSecondaryColor3fv
 .type glSecondaryColor3fv,#function
 glSecondaryColor3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16257,7 +16257,7 @@ glSecondaryColor3fv:
 .globl glSecondaryColor3i
 .type glSecondaryColor3i,#function
 glSecondaryColor3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16278,7 +16278,7 @@ glSecondaryColor3i:
 .globl glSecondaryColor3iv
 .type glSecondaryColor3iv,#function
 glSecondaryColor3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16299,7 +16299,7 @@ glSecondaryColor3iv:
 .globl glSecondaryColor3s
 .type glSecondaryColor3s,#function
 glSecondaryColor3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16320,7 +16320,7 @@ glSecondaryColor3s:
 .globl glSecondaryColor3sv
 .type glSecondaryColor3sv,#function
 glSecondaryColor3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16341,7 +16341,7 @@ glSecondaryColor3sv:
 .globl glSecondaryColor3ub
 .type glSecondaryColor3ub,#function
 glSecondaryColor3ub:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16362,7 +16362,7 @@ glSecondaryColor3ub:
 .globl glSecondaryColor3ubv
 .type glSecondaryColor3ubv,#function
 glSecondaryColor3ubv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16383,7 +16383,7 @@ glSecondaryColor3ubv:
 .globl glSecondaryColor3ui
 .type glSecondaryColor3ui,#function
 glSecondaryColor3ui:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16404,7 +16404,7 @@ glSecondaryColor3ui:
 .globl glSecondaryColor3uiv
 .type glSecondaryColor3uiv,#function
 glSecondaryColor3uiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16425,7 +16425,7 @@ glSecondaryColor3uiv:
 .globl glSecondaryColor3us
 .type glSecondaryColor3us,#function
 glSecondaryColor3us:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16446,7 +16446,7 @@ glSecondaryColor3us:
 .globl glSecondaryColor3usv
 .type glSecondaryColor3usv,#function
 glSecondaryColor3usv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16467,7 +16467,7 @@ glSecondaryColor3usv:
 .globl glSecondaryColorPointer
 .type glSecondaryColorPointer,#function
 glSecondaryColorPointer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16488,7 +16488,7 @@ glSecondaryColorPointer:
 .globl glWindowPos2d
 .type glWindowPos2d,#function
 glWindowPos2d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16509,7 +16509,7 @@ glWindowPos2d:
 .globl glWindowPos2dv
 .type glWindowPos2dv,#function
 glWindowPos2dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16530,7 +16530,7 @@ glWindowPos2dv:
 .globl glWindowPos2f
 .type glWindowPos2f,#function
 glWindowPos2f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16551,7 +16551,7 @@ glWindowPos2f:
 .globl glWindowPos2fv
 .type glWindowPos2fv,#function
 glWindowPos2fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16572,7 +16572,7 @@ glWindowPos2fv:
 .globl glWindowPos2i
 .type glWindowPos2i,#function
 glWindowPos2i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16593,7 +16593,7 @@ glWindowPos2i:
 .globl glWindowPos2iv
 .type glWindowPos2iv,#function
 glWindowPos2iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16614,7 +16614,7 @@ glWindowPos2iv:
 .globl glWindowPos2s
 .type glWindowPos2s,#function
 glWindowPos2s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16635,7 +16635,7 @@ glWindowPos2s:
 .globl glWindowPos2sv
 .type glWindowPos2sv,#function
 glWindowPos2sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16656,7 +16656,7 @@ glWindowPos2sv:
 .globl glWindowPos3d
 .type glWindowPos3d,#function
 glWindowPos3d:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16677,7 +16677,7 @@ glWindowPos3d:
 .globl glWindowPos3dv
 .type glWindowPos3dv,#function
 glWindowPos3dv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16698,7 +16698,7 @@ glWindowPos3dv:
 .globl glWindowPos3f
 .type glWindowPos3f,#function
 glWindowPos3f:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16719,7 +16719,7 @@ glWindowPos3f:
 .globl glWindowPos3fv
 .type glWindowPos3fv,#function
 glWindowPos3fv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16740,7 +16740,7 @@ glWindowPos3fv:
 .globl glWindowPos3i
 .type glWindowPos3i,#function
 glWindowPos3i:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16761,7 +16761,7 @@ glWindowPos3i:
 .globl glWindowPos3iv
 .type glWindowPos3iv,#function
 glWindowPos3iv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16782,7 +16782,7 @@ glWindowPos3iv:
 .globl glWindowPos3s
 .type glWindowPos3s,#function
 glWindowPos3s:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16803,7 +16803,7 @@ glWindowPos3s:
 .globl glWindowPos3sv
 .type glWindowPos3sv,#function
 glWindowPos3sv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16824,7 +16824,7 @@ glWindowPos3sv:
 .globl glActiveStencilFaceEXT
 .type glActiveStencilFaceEXT,#function
 glActiveStencilFaceEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16845,7 +16845,7 @@ glActiveStencilFaceEXT:
 .globl glDeleteFencesNV
 .type glDeleteFencesNV,#function
 glDeleteFencesNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16866,7 +16866,7 @@ glDeleteFencesNV:
 .globl glGenFencesNV
 .type glGenFencesNV,#function
 glGenFencesNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16887,7 +16887,7 @@ glGenFencesNV:
 .globl glIsFenceNV
 .type glIsFenceNV,#function
 glIsFenceNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16908,7 +16908,7 @@ glIsFenceNV:
 .globl glTestFenceNV
 .type glTestFenceNV,#function
 glTestFenceNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16929,7 +16929,7 @@ glTestFenceNV:
 .globl glGetFenceivNV
 .type glGetFenceivNV,#function
 glGetFenceivNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16950,7 +16950,7 @@ glGetFenceivNV:
 .globl glFinishFenceNV
 .type glFinishFenceNV,#function
 glFinishFenceNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16971,7 +16971,7 @@ glFinishFenceNV:
 .globl glSetFenceNV
 .type glSetFenceNV,#function
 glSetFenceNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -16992,7 +16992,7 @@ glSetFenceNV:
 .globl glVertexAttrib1sARB
 .type glVertexAttrib1sARB,#function
 glVertexAttrib1sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17013,7 +17013,7 @@ glVertexAttrib1sARB:
 .globl glVertexAttrib1fARB
 .type glVertexAttrib1fARB,#function
 glVertexAttrib1fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17034,7 +17034,7 @@ glVertexAttrib1fARB:
 .globl glVertexAttrib1dARB
 .type glVertexAttrib1dARB,#function
 glVertexAttrib1dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17055,7 +17055,7 @@ glVertexAttrib1dARB:
 .globl glVertexAttrib2sARB
 .type glVertexAttrib2sARB,#function
 glVertexAttrib2sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17076,7 +17076,7 @@ glVertexAttrib2sARB:
 .globl glVertexAttrib2fARB
 .type glVertexAttrib2fARB,#function
 glVertexAttrib2fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17097,7 +17097,7 @@ glVertexAttrib2fARB:
 .globl glVertexAttrib2dARB
 .type glVertexAttrib2dARB,#function
 glVertexAttrib2dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17118,7 +17118,7 @@ glVertexAttrib2dARB:
 .globl glVertexAttrib3sARB
 .type glVertexAttrib3sARB,#function
 glVertexAttrib3sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17139,7 +17139,7 @@ glVertexAttrib3sARB:
 .globl glVertexAttrib3fARB
 .type glVertexAttrib3fARB,#function
 glVertexAttrib3fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17160,7 +17160,7 @@ glVertexAttrib3fARB:
 .globl glVertexAttrib3dARB
 .type glVertexAttrib3dARB,#function
 glVertexAttrib3dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17181,7 +17181,7 @@ glVertexAttrib3dARB:
 .globl glVertexAttrib4sARB
 .type glVertexAttrib4sARB,#function
 glVertexAttrib4sARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17202,7 +17202,7 @@ glVertexAttrib4sARB:
 .globl glVertexAttrib4fARB
 .type glVertexAttrib4fARB,#function
 glVertexAttrib4fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17223,7 +17223,7 @@ glVertexAttrib4fARB:
 .globl glVertexAttrib4dARB
 .type glVertexAttrib4dARB,#function
 glVertexAttrib4dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17244,7 +17244,7 @@ glVertexAttrib4dARB:
 .globl glVertexAttrib4NubARB
 .type glVertexAttrib4NubARB,#function
 glVertexAttrib4NubARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17265,7 +17265,7 @@ glVertexAttrib4NubARB:
 .globl glVertexAttrib1svARB
 .type glVertexAttrib1svARB,#function
 glVertexAttrib1svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17286,7 +17286,7 @@ glVertexAttrib1svARB:
 .globl glVertexAttrib1fvARB
 .type glVertexAttrib1fvARB,#function
 glVertexAttrib1fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17307,7 +17307,7 @@ glVertexAttrib1fvARB:
 .globl glVertexAttrib1dvARB
 .type glVertexAttrib1dvARB,#function
 glVertexAttrib1dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17328,7 +17328,7 @@ glVertexAttrib1dvARB:
 .globl glVertexAttrib2svARB
 .type glVertexAttrib2svARB,#function
 glVertexAttrib2svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17349,7 +17349,7 @@ glVertexAttrib2svARB:
 .globl glVertexAttrib2fvARB
 .type glVertexAttrib2fvARB,#function
 glVertexAttrib2fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17370,7 +17370,7 @@ glVertexAttrib2fvARB:
 .globl glVertexAttrib2dvARB
 .type glVertexAttrib2dvARB,#function
 glVertexAttrib2dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17391,7 +17391,7 @@ glVertexAttrib2dvARB:
 .globl glVertexAttrib3svARB
 .type glVertexAttrib3svARB,#function
 glVertexAttrib3svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17412,7 +17412,7 @@ glVertexAttrib3svARB:
 .globl glVertexAttrib3fvARB
 .type glVertexAttrib3fvARB,#function
 glVertexAttrib3fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17433,7 +17433,7 @@ glVertexAttrib3fvARB:
 .globl glVertexAttrib3dvARB
 .type glVertexAttrib3dvARB,#function
 glVertexAttrib3dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17454,7 +17454,7 @@ glVertexAttrib3dvARB:
 .globl glVertexAttrib4bvARB
 .type glVertexAttrib4bvARB,#function
 glVertexAttrib4bvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17475,7 +17475,7 @@ glVertexAttrib4bvARB:
 .globl glVertexAttrib4svARB
 .type glVertexAttrib4svARB,#function
 glVertexAttrib4svARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17496,7 +17496,7 @@ glVertexAttrib4svARB:
 .globl glVertexAttrib4ivARB
 .type glVertexAttrib4ivARB,#function
 glVertexAttrib4ivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17517,7 +17517,7 @@ glVertexAttrib4ivARB:
 .globl glVertexAttrib4ubvARB
 .type glVertexAttrib4ubvARB,#function
 glVertexAttrib4ubvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17538,7 +17538,7 @@ glVertexAttrib4ubvARB:
 .globl glVertexAttrib4usvARB
 .type glVertexAttrib4usvARB,#function
 glVertexAttrib4usvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17559,7 +17559,7 @@ glVertexAttrib4usvARB:
 .globl glVertexAttrib4uivARB
 .type glVertexAttrib4uivARB,#function
 glVertexAttrib4uivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17580,7 +17580,7 @@ glVertexAttrib4uivARB:
 .globl glVertexAttrib4fvARB
 .type glVertexAttrib4fvARB,#function
 glVertexAttrib4fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17601,7 +17601,7 @@ glVertexAttrib4fvARB:
 .globl glVertexAttrib4dvARB
 .type glVertexAttrib4dvARB,#function
 glVertexAttrib4dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17622,7 +17622,7 @@ glVertexAttrib4dvARB:
 .globl glVertexAttrib4NbvARB
 .type glVertexAttrib4NbvARB,#function
 glVertexAttrib4NbvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17643,7 +17643,7 @@ glVertexAttrib4NbvARB:
 .globl glVertexAttrib4NsvARB
 .type glVertexAttrib4NsvARB,#function
 glVertexAttrib4NsvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17664,7 +17664,7 @@ glVertexAttrib4NsvARB:
 .globl glVertexAttrib4NivARB
 .type glVertexAttrib4NivARB,#function
 glVertexAttrib4NivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17685,7 +17685,7 @@ glVertexAttrib4NivARB:
 .globl glVertexAttrib4NubvARB
 .type glVertexAttrib4NubvARB,#function
 glVertexAttrib4NubvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17706,7 +17706,7 @@ glVertexAttrib4NubvARB:
 .globl glVertexAttrib4NusvARB
 .type glVertexAttrib4NusvARB,#function
 glVertexAttrib4NusvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17727,7 +17727,7 @@ glVertexAttrib4NusvARB:
 .globl glVertexAttrib4NuivARB
 .type glVertexAttrib4NuivARB,#function
 glVertexAttrib4NuivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17748,7 +17748,7 @@ glVertexAttrib4NuivARB:
 .globl glVertexAttribPointerARB
 .type glVertexAttribPointerARB,#function
 glVertexAttribPointerARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17769,7 +17769,7 @@ glVertexAttribPointerARB:
 .globl glEnableVertexAttribArrayARB
 .type glEnableVertexAttribArrayARB,#function
 glEnableVertexAttribArrayARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17790,7 +17790,7 @@ glEnableVertexAttribArrayARB:
 .globl glDisableVertexAttribArrayARB
 .type glDisableVertexAttribArrayARB,#function
 glDisableVertexAttribArrayARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17811,7 +17811,7 @@ glDisableVertexAttribArrayARB:
 .globl glProgramStringARB
 .type glProgramStringARB,#function
 glProgramStringARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17832,7 +17832,7 @@ glProgramStringARB:
 .globl glBindProgramARB
 .type glBindProgramARB,#function
 glBindProgramARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17853,7 +17853,7 @@ glBindProgramARB:
 .globl glDeleteProgramsARB
 .type glDeleteProgramsARB,#function
 glDeleteProgramsARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17874,7 +17874,7 @@ glDeleteProgramsARB:
 .globl glGenProgramsARB
 .type glGenProgramsARB,#function
 glGenProgramsARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17895,7 +17895,7 @@ glGenProgramsARB:
 .globl glIsProgramARB
 .type glIsProgramARB,#function
 glIsProgramARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17916,7 +17916,7 @@ glIsProgramARB:
 .globl glProgramEnvParameter4dARB
 .type glProgramEnvParameter4dARB,#function
 glProgramEnvParameter4dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17937,7 +17937,7 @@ glProgramEnvParameter4dARB:
 .globl glProgramEnvParameter4dvARB
 .type glProgramEnvParameter4dvARB,#function
 glProgramEnvParameter4dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17958,7 +17958,7 @@ glProgramEnvParameter4dvARB:
 .globl glProgramEnvParameter4fARB
 .type glProgramEnvParameter4fARB,#function
 glProgramEnvParameter4fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -17979,7 +17979,7 @@ glProgramEnvParameter4fARB:
 .globl glProgramEnvParameter4fvARB
 .type glProgramEnvParameter4fvARB,#function
 glProgramEnvParameter4fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18000,7 +18000,7 @@ glProgramEnvParameter4fvARB:
 .globl glProgramLocalParameter4dARB
 .type glProgramLocalParameter4dARB,#function
 glProgramLocalParameter4dARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18021,7 +18021,7 @@ glProgramLocalParameter4dARB:
 .globl glProgramLocalParameter4dvARB
 .type glProgramLocalParameter4dvARB,#function
 glProgramLocalParameter4dvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18042,7 +18042,7 @@ glProgramLocalParameter4dvARB:
 .globl glProgramLocalParameter4fARB
 .type glProgramLocalParameter4fARB,#function
 glProgramLocalParameter4fARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18063,7 +18063,7 @@ glProgramLocalParameter4fARB:
 .globl glProgramLocalParameter4fvARB
 .type glProgramLocalParameter4fvARB,#function
 glProgramLocalParameter4fvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18084,7 +18084,7 @@ glProgramLocalParameter4fvARB:
 .globl glGetProgramEnvParameterdvARB
 .type glGetProgramEnvParameterdvARB,#function
 glGetProgramEnvParameterdvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18105,7 +18105,7 @@ glGetProgramEnvParameterdvARB:
 .globl glGetProgramEnvParameterfvARB
 .type glGetProgramEnvParameterfvARB,#function
 glGetProgramEnvParameterfvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18126,7 +18126,7 @@ glGetProgramEnvParameterfvARB:
 .globl glGetProgramLocalParameterdvARB
 .type glGetProgramLocalParameterdvARB,#function
 glGetProgramLocalParameterdvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18147,7 +18147,7 @@ glGetProgramLocalParameterdvARB:
 .globl glGetProgramLocalParameterfvARB
 .type glGetProgramLocalParameterfvARB,#function
 glGetProgramLocalParameterfvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18168,7 +18168,7 @@ glGetProgramLocalParameterfvARB:
 .globl glGetProgramivARB
 .type glGetProgramivARB,#function
 glGetProgramivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18189,7 +18189,7 @@ glGetProgramivARB:
 .globl glGetProgramStringARB
 .type glGetProgramStringARB,#function
 glGetProgramStringARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18210,7 +18210,7 @@ glGetProgramStringARB:
 .globl glGetVertexAttribdvARB
 .type glGetVertexAttribdvARB,#function
 glGetVertexAttribdvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18231,7 +18231,7 @@ glGetVertexAttribdvARB:
 .globl glGetVertexAttribfvARB
 .type glGetVertexAttribfvARB,#function
 glGetVertexAttribfvARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18252,7 +18252,7 @@ glGetVertexAttribfvARB:
 .globl glGetVertexAttribivARB
 .type glGetVertexAttribivARB,#function
 glGetVertexAttribivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18273,7 +18273,7 @@ glGetVertexAttribivARB:
 .globl glGetVertexAttribPointervARB
 .type glGetVertexAttribPointervARB,#function
 glGetVertexAttribPointervARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18294,7 +18294,7 @@ glGetVertexAttribPointervARB:
 .globl glProgramNamedParameter4fNV
 .type glProgramNamedParameter4fNV,#function
 glProgramNamedParameter4fNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18315,7 +18315,7 @@ glProgramNamedParameter4fNV:
 .globl glProgramNamedParameter4dNV
 .type glProgramNamedParameter4dNV,#function
 glProgramNamedParameter4dNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18336,7 +18336,7 @@ glProgramNamedParameter4dNV:
 .globl glProgramNamedParameter4fvNV
 .type glProgramNamedParameter4fvNV,#function
 glProgramNamedParameter4fvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18357,7 +18357,7 @@ glProgramNamedParameter4fvNV:
 .globl glProgramNamedParameter4dvNV
 .type glProgramNamedParameter4dvNV,#function
 glProgramNamedParameter4dvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18378,7 +18378,7 @@ glProgramNamedParameter4dvNV:
 .globl glGetProgramNamedParameterfvNV
 .type glGetProgramNamedParameterfvNV,#function
 glGetProgramNamedParameterfvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18399,7 +18399,7 @@ glGetProgramNamedParameterfvNV:
 .globl glGetProgramNamedParameterdvNV
 .type glGetProgramNamedParameterdvNV,#function
 glGetProgramNamedParameterdvNV:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18420,7 +18420,7 @@ glGetProgramNamedParameterdvNV:
 .globl glBindBufferARB
 .type glBindBufferARB,#function
 glBindBufferARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18441,7 +18441,7 @@ glBindBufferARB:
 .globl glBufferDataARB
 .type glBufferDataARB,#function
 glBufferDataARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18462,7 +18462,7 @@ glBufferDataARB:
 .globl glBufferSubDataARB
 .type glBufferSubDataARB,#function
 glBufferSubDataARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18483,7 +18483,7 @@ glBufferSubDataARB:
 .globl glDeleteBuffersARB
 .type glDeleteBuffersARB,#function
 glDeleteBuffersARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18504,7 +18504,7 @@ glDeleteBuffersARB:
 .globl glGenBuffersARB
 .type glGenBuffersARB,#function
 glGenBuffersARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18525,7 +18525,7 @@ glGenBuffersARB:
 .globl glGetBufferParameterivARB
 .type glGetBufferParameterivARB,#function
 glGetBufferParameterivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18546,7 +18546,7 @@ glGetBufferParameterivARB:
 .globl glGetBufferPointervARB
 .type glGetBufferPointervARB,#function
 glGetBufferPointervARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18567,7 +18567,7 @@ glGetBufferPointervARB:
 .globl glGetBufferSubDataARB
 .type glGetBufferSubDataARB,#function
 glGetBufferSubDataARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18588,7 +18588,7 @@ glGetBufferSubDataARB:
 .globl glIsBufferARB
 .type glIsBufferARB,#function
 glIsBufferARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18609,7 +18609,7 @@ glIsBufferARB:
 .globl glMapBufferARB
 .type glMapBufferARB,#function
 glMapBufferARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18630,7 +18630,7 @@ glMapBufferARB:
 .globl glUnmapBufferARB
 .type glUnmapBufferARB,#function
 glUnmapBufferARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18651,7 +18651,7 @@ glUnmapBufferARB:
 .globl glDepthBoundsEXT
 .type glDepthBoundsEXT,#function
 glDepthBoundsEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18672,7 +18672,7 @@ glDepthBoundsEXT:
 .globl glGenQueriesARB
 .type glGenQueriesARB,#function
 glGenQueriesARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18693,7 +18693,7 @@ glGenQueriesARB:
 .globl glDeleteQueriesARB
 .type glDeleteQueriesARB,#function
 glDeleteQueriesARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18714,7 +18714,7 @@ glDeleteQueriesARB:
 .globl glIsQueryARB
 .type glIsQueryARB,#function
 glIsQueryARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18735,7 +18735,7 @@ glIsQueryARB:
 .globl glBeginQueryARB
 .type glBeginQueryARB,#function
 glBeginQueryARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18756,7 +18756,7 @@ glBeginQueryARB:
 .globl glEndQueryARB
 .type glEndQueryARB,#function
 glEndQueryARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18777,7 +18777,7 @@ glEndQueryARB:
 .globl glGetQueryivARB
 .type glGetQueryivARB,#function
 glGetQueryivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18798,7 +18798,7 @@ glGetQueryivARB:
 .globl glGetQueryObjectivARB
 .type glGetQueryObjectivARB,#function
 glGetQueryObjectivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18819,7 +18819,7 @@ glGetQueryObjectivARB:
 .globl glGetQueryObjectuivARB
 .type glGetQueryObjectuivARB,#function
 glGetQueryObjectuivARB:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18840,7 +18840,7 @@ glGetQueryObjectuivARB:
 .globl glBindBuffer
 .type glBindBuffer,#function
 glBindBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18861,7 +18861,7 @@ glBindBuffer:
 .globl glBufferData
 .type glBufferData,#function
 glBufferData:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18882,7 +18882,7 @@ glBufferData:
 .globl glBufferSubData
 .type glBufferSubData,#function
 glBufferSubData:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18903,7 +18903,7 @@ glBufferSubData:
 .globl glDeleteBuffers
 .type glDeleteBuffers,#function
 glDeleteBuffers:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18924,7 +18924,7 @@ glDeleteBuffers:
 .globl glGenBuffers
 .type glGenBuffers,#function
 glGenBuffers:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18945,7 +18945,7 @@ glGenBuffers:
 .globl glGetBufferParameteriv
 .type glGetBufferParameteriv,#function
 glGetBufferParameteriv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18966,7 +18966,7 @@ glGetBufferParameteriv:
 .globl glGetBufferPointerv
 .type glGetBufferPointerv,#function
 glGetBufferPointerv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -18987,7 +18987,7 @@ glGetBufferPointerv:
 .globl glGetBufferSubData
 .type glGetBufferSubData,#function
 glGetBufferSubData:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19008,7 +19008,7 @@ glGetBufferSubData:
 .globl glIsBuffer
 .type glIsBuffer,#function
 glIsBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19029,7 +19029,7 @@ glIsBuffer:
 .globl glMapBuffer
 .type glMapBuffer,#function
 glMapBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19050,7 +19050,7 @@ glMapBuffer:
 .globl glUnmapBuffer
 .type glUnmapBuffer,#function
 glUnmapBuffer:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19071,7 +19071,7 @@ glUnmapBuffer:
 .globl glGenQueries
 .type glGenQueries,#function
 glGenQueries:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19092,7 +19092,7 @@ glGenQueries:
 .globl glDeleteQueries
 .type glDeleteQueries,#function
 glDeleteQueries:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19113,7 +19113,7 @@ glDeleteQueries:
 .globl glIsQuery
 .type glIsQuery,#function
 glIsQuery:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19134,7 +19134,7 @@ glIsQuery:
 .globl glBeginQuery
 .type glBeginQuery,#function
 glBeginQuery:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19155,7 +19155,7 @@ glBeginQuery:
 .globl glEndQuery
 .type glEndQuery,#function
 glEndQuery:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19176,7 +19176,7 @@ glEndQuery:
 .globl glGetQueryiv
 .type glGetQueryiv,#function
 glGetQueryiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19197,7 +19197,7 @@ glGetQueryiv:
 .globl glGetQueryObjectiv
 .type glGetQueryObjectiv,#function
 glGetQueryObjectiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19218,7 +19218,7 @@ glGetQueryObjectiv:
 .globl glGetQueryObjectuiv
 .type glGetQueryObjectuiv,#function
 glGetQueryObjectuiv:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19239,7 +19239,7 @@ glGetQueryObjectuiv:
 .globl glBlendEquationSeparateEXT
 .type glBlendEquationSeparateEXT,#function
 glBlendEquationSeparateEXT:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
@@ -19260,7 +19260,7 @@ glBlendEquationSeparateEXT:
 .globl glBlendEquationSeparateATI
 .type glBlendEquationSeparateATI,#function
 glBlendEquationSeparateATI:
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
 	or	%g2, %lo(0x00000000), %g2
diff --git a/extras/Mesa/src/mesa/sparc/norm.S b/extras/Mesa/src/mesa/sparc/norm.S
index a3574037f..2a2139b6b 100644
--- a/extras/Mesa/src/mesa/sparc/norm.S
+++ b/extras/Mesa/src/mesa/sparc/norm.S
@@ -10,7 +10,7 @@
 
 	.text
 
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 #define STACK_VAR_OFF	(2047 + (8 * 16))
 #else
 #define STACK_VAR_OFF	(4 * 16)
diff --git a/extras/Mesa/src/mesa/sparc/sparc.c b/extras/Mesa/src/mesa/sparc/sparc.c
index d0c6bba58..2a0737491 100644
--- a/extras/Mesa/src/mesa/sparc/sparc.c
+++ b/extras/Mesa/src/mesa/sparc/sparc.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.3
  * 
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  * 
@@ -27,12 +27,13 @@
  */
 
 
+#include "sparc.h"
+
 #ifdef USE_SPARC_ASM
 
 #include "context.h"
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
-#include "sparc.h"
 
 #ifdef DEBUG
 #include "math/m_debug.h"
@@ -68,7 +69,6 @@
       _mesa_##pfx##_transform_points##sz##_3d;
 
 
-#ifdef USE_SPARC_ASM
 DECLARE_XFORM_GROUP(sparc, 1)
 DECLARE_XFORM_GROUP(sparc, 2)
 DECLARE_XFORM_GROUP(sparc, 3)
@@ -101,11 +101,10 @@ extern void _mesa_sparc_transform_normals(NORM_ARGS);
 extern void _mesa_sparc_normalize_normals(NORM_ARGS);
 extern void _mesa_sparc_rescale_normals(NORM_ARGS);
 
-#endif
+
 
 void _mesa_init_all_sparc_transform_asm(void)
 {
-#ifdef USE_SPARC_ASM
    ASSIGN_XFORM_GROUP(sparc, 1)
    ASSIGN_XFORM_GROUP(sparc, 2)
    ASSIGN_XFORM_GROUP(sparc, 3)
@@ -143,8 +142,6 @@ void _mesa_init_all_sparc_transform_asm(void)
    _math_test_all_cliptest_functions("sparc");
    _math_test_all_normal_transform_functions("sparc");
 #endif
-
-#endif
 }
 
 extern unsigned int _mesa_sparc_glapi_begin;
@@ -165,7 +162,7 @@ void _mesa_init_sparc_glapi_relocs(void)
 	disp_addr = (unsigned long) &_glapi_Dispatch;
 
 	while (insn_ptr < end_ptr) {
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 		insn_ptr[0] |= (disp_addr >> (32 + 10));
 		insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10);
 		__glapi_sparc_icache_flush(&insn_ptr[0]);
diff --git a/extras/Mesa/src/mesa/sparc/sparc_matrix.h b/extras/Mesa/src/mesa/sparc/sparc_matrix.h
index 5a70cafdb..d74b48745 100644
--- a/extras/Mesa/src/mesa/sparc/sparc_matrix.h
+++ b/extras/Mesa/src/mesa/sparc/sparc_matrix.h
@@ -5,7 +5,7 @@
 #ifndef _SPARC_MATRIX_H
 #define _SPARC_MATRIX_H
 
-#if defined(__sparc_v9__) && !defined(__linux__)
+#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__)))
 #define LDPTR		ldx
 #define MAT_M		0x00
 #define MAT_INV		0x08
diff --git a/extras/Mesa/src/mesa/swrast/s_alphabuf.c b/extras/Mesa/src/mesa/swrast/s_alphabuf.c
index b563baf39..f57449c7b 100644
--- a/extras/Mesa/src/mesa/swrast/s_alphabuf.c
+++ b/extras/Mesa/src/mesa/swrast/s_alphabuf.c
@@ -178,16 +178,12 @@ GLchan *get_alpha_buffer( GLcontext *ctx )
    switch (swrast->CurrentBufferBit) {
    case DD_FRONT_LEFT_BIT:
       return ctx->DrawBuffer->FrontLeftAlpha;
-      break;
    case DD_BACK_LEFT_BIT:
       return ctx->DrawBuffer->BackLeftAlpha;
-      break;
    case DD_FRONT_RIGHT_BIT:
       return ctx->DrawBuffer->FrontRightAlpha;
-      break;
    case DD_BACK_RIGHT_BIT:
       return ctx->DrawBuffer->BackRightAlpha;
-      break;
    default:
       _mesa_problem(ctx, "Bad CurrentBuffer in get_alpha_buffer()");
       return (GLchan *) ctx->DrawBuffer->FrontLeftAlpha;
diff --git a/extras/Mesa/src/mesa/swrast/s_context.c b/extras/Mesa/src/mesa/swrast/s_context.c
index a678e0b55..418c6412b 100644
--- a/extras/Mesa/src/mesa/swrast/s_context.c
+++ b/extras/Mesa/src/mesa/swrast/s_context.c
@@ -196,19 +196,22 @@ _swrast_update_fog_state( GLcontext *ctx )
    CLAMPED_FLOAT_TO_CHAN(swrast->_FogColor[GCOMP], ctx->Fog.Color[GCOMP]);
    CLAMPED_FLOAT_TO_CHAN(swrast->_FogColor[BCOMP], ctx->Fog.Color[BCOMP]);
 
-   /* determine if fog is needed */
+   /* determine if fog is needed, and if so, which fog mode */
    swrast->_FogEnabled = GL_FALSE;
-   if (ctx->Fog.Enabled) {
-      swrast->_FogEnabled = GL_TRUE;
-   }
-   else if (ctx->FragmentProgram._Enabled &&
-        ctx->FragmentProgram.Current->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
-      const struct fragment_program *p;
-      p = (struct fragment_program *) ctx->FragmentProgram.Current;
-      if (p->FogOption != GL_NONE) {
-         swrast->_FogEnabled = GL_TRUE;
+   if (ctx->FragmentProgram._Enabled) {
+      if (ctx->FragmentProgram.Current->Base.Target==GL_FRAGMENT_PROGRAM_ARB) {
+         const struct fragment_program *p
+            = (struct fragment_program *) ctx->FragmentProgram.Current;
+         if (p->FogOption != GL_NONE) {
+            swrast->_FogEnabled = GL_TRUE;
+            swrast->_FogMode = p->FogOption;
+         }
       }
    }
+   else if (ctx->Fog.Enabled) {
+      swrast->_FogEnabled = GL_TRUE;
+      swrast->_FogMode = ctx->Fog.Mode;
+   }
 }
 
 
@@ -480,7 +483,7 @@ _swrast_validate_derived( GLcontext *ctx )
       if (swrast->NewState & _SWRAST_NEW_TEXTURE_ENV_MODE)
 	 _swrast_update_texture_env( ctx );
 
-      if (swrast->NewState & _NEW_FOG)
+      if (swrast->NewState & (_NEW_FOG | _NEW_PROGRAM))
          _swrast_update_fog_state( ctx );
 
       if (swrast->NewState & _NEW_PROGRAM)
diff --git a/extras/Mesa/src/mesa/swrast/s_context.h b/extras/Mesa/src/mesa/swrast/s_context.h
index ea877a4bd..aba32755d 100644
--- a/extras/Mesa/src/mesa/swrast/s_context.h
+++ b/extras/Mesa/src/mesa/swrast/s_context.h
@@ -286,6 +286,7 @@ typedef struct
    GLboolean _AnyTextureCombine;
    GLchan _FogColor[3];
    GLboolean _FogEnabled;
+   GLenum _FogMode;  /* either GL_FOG_MODE or fragment program's fog mode */
 
    /* Accum buffer temporaries.
     */
diff --git a/extras/Mesa/src/mesa/swrast/s_copypix.c b/extras/Mesa/src/mesa/swrast/s_copypix.c
index f715e5a62..f226b7c0f 100644
--- a/extras/Mesa/src/mesa/swrast/s_copypix.c
+++ b/extras/Mesa/src/mesa/swrast/s_copypix.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.2
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -175,8 +175,6 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       return;
    }
 
-   dest = tmpImage;
-
    if (changeBuffer) {
       /* choose the read buffer */
       _swrast_use_read_buffer(ctx);
@@ -191,6 +189,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
                              srcy + row, rgba);
       chan_span_to_float(width, (CONST GLchan (*)[4]) rgba,
                          (GLfloat (*)[4]) dest);
+      dest += 4 * width;
    }
 
    if (changeBuffer) {
diff --git a/extras/Mesa/src/mesa/swrast/s_fog.c b/extras/Mesa/src/mesa/swrast/s_fog.c
index 89ed1152b..613759d1c 100644
--- a/extras/Mesa/src/mesa/swrast/s_fog.c
+++ b/extras/Mesa/src/mesa/swrast/s_fog.c
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.3
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,8 +33,6 @@
 #include "s_span.h"
 
 
-
-
 /**
  * Used to convert current raster distance to a fog factor in [0,1].
  */
@@ -99,7 +96,7 @@ _swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
       /* The span's fog values are fog coordinates, now compute blend factors
        * and blend the fragment colors with the fog color.
        */
-      switch (ctx->Fog.Mode) {
+      switch (swrast->_FogMode) {
       case GL_LINEAR:
          {
             const GLfloat fogEnd = ctx->Fog.End;
diff --git a/extras/Mesa/src/mesa/swrast/s_lines.c b/extras/Mesa/src/mesa/swrast/s_lines.c
index 4d9fe5892..e7bb2090c 100644
--- a/extras/Mesa/src/mesa/swrast/s_lines.c
+++ b/extras/Mesa/src/mesa/swrast/s_lines.c
@@ -258,7 +258,7 @@ _mesa_print_line_function(GLcontext *ctx)
    else if (swrast->Line == multitextured_line)
       _mesa_printf("multitextured_line\n");
    else
-      _mesa_printf("Driver func %p\n", (void *) swrast->Line);
+      _mesa_printf("Driver func %p\n", (void (*)()) swrast->Line);
 }
 #endif
 
diff --git a/extras/Mesa/src/mesa/swrast/s_linetemp.h b/extras/Mesa/src/mesa/swrast/s_linetemp.h
index 77c985455..5d9591d83 100644
--- a/extras/Mesa/src/mesa/swrast/s_linetemp.h
+++ b/extras/Mesa/src/mesa/swrast/s_linetemp.h
@@ -425,6 +425,8 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
    RENDER_SPAN( span );
 #endif
 
+   (void)span;
+
 }
 
 
diff --git a/extras/Mesa/src/mesa/swrast/s_pointtemp.h b/extras/Mesa/src/mesa/swrast/s_pointtemp.h
index de940b355..3735e89f1 100644
--- a/extras/Mesa/src/mesa/swrast/s_pointtemp.h
+++ b/extras/Mesa/src/mesa/swrast/s_pointtemp.h
@@ -220,6 +220,21 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
       count = span->end;
       (void) radius;
       for (y = ymin; y <= ymax; y++) {
+         /* check if we need to flush */
+         if (count + (xmax-xmin+1) >= MAX_WIDTH) {
+	     span->end = count;
+#if FLAGS & (TEXTURE | SPRITE)
+            if (ctx->Texture._EnabledUnits)
+               _swrast_write_texture_span(ctx, span);
+            else
+               _swrast_write_rgba_span(ctx, span);
+#elif FLAGS & RGBA
+            _swrast_write_rgba_span(ctx, span);
+#else
+            _swrast_write_index_span(ctx, span);
+#endif
+            count = span->end = 0;
+         }
          for (x = xmin; x <= xmax; x++) {
 #if FLAGS & (SPRITE | TEXTURE)
             GLuint u;
diff --git a/extras/Mesa/src/mesa/swrast/s_readpix.c b/extras/Mesa/src/mesa/swrast/s_readpix.c
index 80f737b05..e6c333f6b 100644
--- a/extras/Mesa/src/mesa/swrast/s_readpix.c
+++ b/extras/Mesa/src/mesa/swrast/s_readpix.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.2.1
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -86,7 +86,7 @@ read_index_pixels( GLcontext *ctx,
                                  GL_COLOR_INDEX, type, 0, i, 0);
 
       _mesa_pack_index_span(ctx, readWidth, type, dest, index,
-                            &ctx->Pack, ctx->_ImageTransferState);
+                            packing, ctx->_ImageTransferState);
    }
 
    _swrast_use_draw_buffer(ctx);
@@ -163,7 +163,7 @@ read_depth_pixels( GLcontext *ctx,
                                     GL_DEPTH_COMPONENT, type, 0, j, 0);
 
          _mesa_pack_depth_span(ctx, readWidth, (GLdepth *) dest, type,
-                               depth, &ctx->Pack);
+                               depth, packing);
       }
    }
 }
@@ -209,7 +209,7 @@ read_stencil_pixels( GLcontext *ctx,
       dest = _mesa_image_address(packing, pixels, width, height,
                                  GL_STENCIL_INDEX, type, 0, j, 0);
 
-      _mesa_pack_stencil_span(ctx, readWidth, type, dest, stencil, &ctx->Pack);
+      _mesa_pack_stencil_span(ctx, readWidth, type, dest, stencil, packing);
    }
 }
 
@@ -498,16 +498,15 @@ void
 _swrast_ReadPixels( GLcontext *ctx,
 		    GLint x, GLint y, GLsizei width, GLsizei height,
 		    GLenum format, GLenum type,
-		    const struct gl_pixelstore_attrib *pack,
+		    const struct gl_pixelstore_attrib *packing,
 		    GLvoid *pixels )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   (void) pack;
 
    if (swrast->NewState)
       _swrast_validate_derived( ctx );
 
-   pixels = _swrast_validate_pbo_access(pack, width, height, 1,
+   pixels = _swrast_validate_pbo_access(packing, width, height, 1,
                                         format, type, (GLvoid *) pixels);
 
    if (!pixels) {
@@ -519,13 +518,13 @@ _swrast_ReadPixels( GLcontext *ctx,
 
    switch (format) {
       case GL_COLOR_INDEX:
-         read_index_pixels(ctx, x, y, width, height, type, pixels, &ctx->Pack);
+         read_index_pixels(ctx, x, y, width, height, type, pixels, packing);
 	 break;
       case GL_STENCIL_INDEX:
-	 read_stencil_pixels(ctx, x,y, width,height, type, pixels, &ctx->Pack);
+	 read_stencil_pixels(ctx, x,y, width,height, type, pixels, packing);
          break;
       case GL_DEPTH_COMPONENT:
-	 read_depth_pixels(ctx, x, y, width, height, type, pixels, &ctx->Pack);
+	 read_depth_pixels(ctx, x, y, width, height, type, pixels, packing);
 	 break;
       case GL_RED:
       case GL_GREEN:
@@ -539,7 +538,7 @@ _swrast_ReadPixels( GLcontext *ctx,
       case GL_BGRA:
       case GL_ABGR_EXT:
          read_rgba_pixels(ctx, x, y, width, height,
-                          format, type, pixels, &ctx->Pack);
+                          format, type, pixels, packing);
 	 break;
       default:
 	 _mesa_error( ctx, GL_INVALID_ENUM, "glReadPixels(format)" );
diff --git a/extras/Mesa/src/mesa/swrast/s_span.c b/extras/Mesa/src/mesa/swrast/s_span.c
index 46f59ef3c..8fb89f692 100644
--- a/extras/Mesa/src/mesa/swrast/s_span.c
+++ b/extras/Mesa/src/mesa/swrast/s_span.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -1473,15 +1473,17 @@ _swrast_write_texture_span( GLcontext *ctx, struct sw_span *span)
 
    ASSERT(span->arrayMask & SPAN_RGBA);
 
-   /* Add base and specular colors */
-   if (ctx->Fog.ColorSumEnabled ||
-       (ctx->Light.Enabled &&
-        ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {
-      if (span->interpMask & SPAN_SPEC) {
-         interpolate_specular(ctx, span);
+   if (!ctx->FragmentProgram._Enabled) {
+      /* Add base and specular colors */
+      if (ctx->Fog.ColorSumEnabled ||
+          (ctx->Light.Enabled &&
+           ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {
+         if (span->interpMask & SPAN_SPEC) {
+            interpolate_specular(ctx, span);
+         }
+         ASSERT(span->arrayMask & SPAN_SPEC);
+         add_colors( span->end, span->array->rgba, span->array->spec );
       }
-      ASSERT(span->arrayMask & SPAN_SPEC);
-      add_colors( span->end, span->array->rgba, span->array->spec );
    }
 
    /* Fog */
diff --git a/extras/Mesa/src/mesa/swrast/s_spantemp.h b/extras/Mesa/src/mesa/swrast/s_spantemp.h
index 95d9358a1..1ce0b00be 100644
--- a/extras/Mesa/src/mesa/swrast/s_spantemp.h
+++ b/extras/Mesa/src/mesa/swrast/s_spantemp.h
@@ -47,6 +47,7 @@
  *   FETCH_CI_PIXEL(CI, P)  to fetch a pixel index from pixel P
  */
 
+#include "macros.h"
 
 #ifdef STORE_RGBA_PIXEL
 
diff --git a/extras/Mesa/src/mesa/swrast/s_texture.c b/extras/Mesa/src/mesa/swrast/s_texture.c
index 4cb84d12f..213971667 100644
--- a/extras/Mesa/src/mesa/swrast/s_texture.c
+++ b/extras/Mesa/src/mesa/swrast/s_texture.c
@@ -2727,7 +2727,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
             ASSERT(t->MinFilter == GL_NEAREST);
             return &sample_nearest_1d;
          }
-         break;
       case GL_TEXTURE_2D:
          if (format == GL_DEPTH_COMPONENT) {
             return &sample_depth_texture;
@@ -2759,7 +2758,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
                return &sample_nearest_2d;
             }
          }
-         break;
       case GL_TEXTURE_3D:
          if (needLambda) {
             return &sample_lambda_3d;
@@ -2771,7 +2769,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
             ASSERT(t->MinFilter == GL_NEAREST);
             return &sample_nearest_3d;
          }
-         break;
       case GL_TEXTURE_CUBE_MAP:
          if (needLambda) {
             return &sample_lambda_cube;
@@ -2783,7 +2780,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
             ASSERT(t->MinFilter == GL_NEAREST);
             return &sample_nearest_cube;
          }
-         break;
       case GL_TEXTURE_RECTANGLE_NV:
          if (needLambda) {
             return &sample_lambda_rect;
@@ -2795,7 +2791,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
             ASSERT(t->MinFilter == GL_NEAREST);
             return &sample_nearest_rect;
          }
-         break;
       default:
          _mesa_problem(ctx,
                        "invalid target in _swrast_choose_texture_sample_func");
diff --git a/extras/Mesa/src/mesa/tnl/t_save_loopback.c b/extras/Mesa/src/mesa/tnl/t_save_loopback.c
index 18ecc3514..2e752c809 100644
--- a/extras/Mesa/src/mesa/tnl/t_save_loopback.c
+++ b/extras/Mesa/src/mesa/tnl/t_save_loopback.c
@@ -196,7 +196,7 @@ static void loopback_prim( GLcontext *ctx,
    GLuint k;
 
    if (prim->mode & PRIM_BEGIN) {
-      glBegin( prim->mode & PRIM_MODE_MASK );
+      GL_CALL(Begin)( prim->mode & PRIM_MODE_MASK );
    }
    else {
       assert(i == 0);
@@ -221,7 +221,7 @@ static void loopback_prim( GLcontext *ctx,
    }
 
    if (prim->mode & PRIM_END) {
-      glEnd();
+      GL_CALL(End)();
    }
    else {
       assert (i == list->prim_count-1);
diff --git a/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h b/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h
index 2eaf61ff4..d8094e29c 100644
--- a/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h
+++ b/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h
@@ -253,8 +253,9 @@ static void TAG(light_rgba)( GLcontext *ctx,
    const GLfloat *normal = (GLfloat *)VB->NormalPtr->data;
 
    GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
+#if IDX & LIGHT_TWOSIDE
    GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
-   GLfloat (*color[2])[4];
+#endif
 
    const GLuint nr = VB->Count;
 
@@ -265,9 +266,6 @@ static void TAG(light_rgba)( GLcontext *ctx,
    (void) nstride;
    (void) vstride;
 
-   color[0] = Fcolor;
-   color[1] = Bcolor;
-
    VB->ColorPtr[0] = &store->LitColor[0];
    sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
 
diff --git a/extras/Mesa/src/mesa/tnl/t_vertex.c b/extras/Mesa/src/mesa/tnl/t_vertex.c
index 7147193a0..984241c6a 100644
--- a/extras/Mesa/src/mesa/tnl/t_vertex.c
+++ b/extras/Mesa/src/mesa/tnl/t_vertex.c
@@ -398,6 +398,86 @@ static void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v
    v[3] = 0xff;
 }
 
+static void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[2]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
+}
+
+static void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[2]);
+   v[0] = 0xff;
+}
+
+static void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
+   v[3] = 0x00;
+   v[0] = 0xff;
+}
+
+static void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
+   v[2] = 0x00;
+   v[3] = 0x00;
+   v[0] = 0xff;
+}
+
+static void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[2]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
+}
+
+static void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[2]);
+   v[0] = 0xff;
+}
+
+static void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
+   v[1] = 0x00;
+   v[0] = 0xff;
+}
+
+static void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   (void) a;
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
+   v[2] = 0x00;
+   v[1] = 0x00;
+   v[0] = 0xff;
+}
+
 static void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 			       const GLfloat *in )
 {
@@ -598,6 +678,26 @@ static void extract_4ub_4f_bgra( const struct tnl_clipspace_attr *a, GLfloat *ou
    out[3] = UBYTE_TO_FLOAT(v[3]);
 }
 
+static void extract_4ub_4f_argb( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   (void) a;
+   out[3] = UBYTE_TO_FLOAT(v[0]);
+   out[0] = UBYTE_TO_FLOAT(v[1]);
+   out[1] = UBYTE_TO_FLOAT(v[2]);
+   out[2] = UBYTE_TO_FLOAT(v[3]);
+}
+
+static void extract_4ub_4f_abgr( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   (void) a;
+   out[3] = UBYTE_TO_FLOAT(v[0]);
+   out[2] = UBYTE_TO_FLOAT(v[1]);
+   out[1] = UBYTE_TO_FLOAT(v[2]);
+   out[0] = UBYTE_TO_FLOAT(v[3]);
+}
+
 static void extract_3ub_3f_rgb( const struct tnl_clipspace_attr *a, GLfloat *out, 
 				const GLubyte *v )
 {
@@ -708,6 +808,18 @@ static struct {
        insert_4ub_4f_bgra_4 },
      4 * sizeof(GLubyte) },
 
+   { "4ub_4f_argb",
+     extract_4ub_4f_argb,
+     { insert_4ub_4f_argb_1, insert_4ub_4f_argb_2, insert_4ub_4f_argb_3,
+       insert_4ub_4f_argb_4 },
+     4 * sizeof(GLubyte) },
+
+   { "4ub_4f_abgr",
+     extract_4ub_4f_abgr,
+     { insert_4ub_4f_abgr_1, insert_4ub_4f_abgr_2, insert_4ub_4f_abgr_3,
+       insert_4ub_4f_abgr_4 },
+     4 * sizeof(GLubyte) },
+
    { "4chan_4f_rgba",
      extract_4chan_4f_rgba,
      { insert_4chan_4f_rgba_1, insert_4chan_4f_rgba_2, insert_4chan_4f_rgba_3,
diff --git a/extras/Mesa/src/mesa/tnl/t_vertex.h b/extras/Mesa/src/mesa/tnl/t_vertex.h
index 6e0813e79..caa222014 100644
--- a/extras/Mesa/src/mesa/tnl/t_vertex.h
+++ b/extras/Mesa/src/mesa/tnl/t_vertex.h
@@ -53,6 +53,8 @@ enum tnl_attr_format {
    EMIT_3UB_3F_BGR,		/* for specular color */
    EMIT_4UB_4F_RGBA,		/* for color */
    EMIT_4UB_4F_BGRA,		/* for color */
+   EMIT_4UB_4F_ARGB,		/* for color */
+   EMIT_4UB_4F_ABGR,		/* for color */
    EMIT_4CHAN_4F_RGBA,		/* for swrast color */
    EMIT_PAD,			/* leave a hole of 'offset' bytes */
    EMIT_MAX
diff --git a/extras/Mesa/src/mesa/tnl/t_vtx_eval.c b/extras/Mesa/src/mesa/tnl/t_vtx_eval.c
index ea9da13fe..5a24c70d2 100644
--- a/extras/Mesa/src/mesa/tnl/t_vtx_eval.c
+++ b/extras/Mesa/src/mesa/tnl/t_vtx_eval.c
@@ -165,9 +165,9 @@ void _tnl_do_EvalCoord1f(GLcontext* ctx, GLfloat u)
 				map->Order);
 
       if (tnl->vtx.eval.map1[0].sz == 4) 
-	 glVertex4fv( vertex );
+	 GL_CALL(Vertex4fv)( vertex );
       else
-	 glVertex3fv( vertex ); 
+	 GL_CALL(Vertex3fv)( vertex ); 
    }
 }
 
@@ -244,9 +244,9 @@ void _tnl_do_EvalCoord2f( GLcontext* ctx, GLfloat u, GLfloat v )
       }
 
       if (tnl->vtx.attrsz[0] == 4) 
-	 glVertex4fv( vertex );
+	 GL_CALL(Vertex4fv)( vertex );
       else
-	 glVertex3fv( vertex ); 
+	 GL_CALL(Vertex3fv)( vertex ); 
    }
 }
 
diff --git a/extras/Mesa/src/mesa/x86/Makefile b/extras/Mesa/src/mesa/x86/Makefile
index 0c725d337..125f8937d 100644
--- a/extras/Mesa/src/mesa/x86/Makefile
+++ b/extras/Mesa/src/mesa/x86/Makefile
@@ -11,6 +11,7 @@ INCLUDE_DIRS = \
 	-I$(TOP)/include \
 	-I.. \
 	-I../main \
+	-I../math \
 	-I../glapi \
 	-I../tnl