Re-enable SPARC assembly on sunos5-gcc platform.

diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc
index 59fcccf9d64a4fcb1e41d16bd3f46882447287d0..147f69dbcba7643ca544cb53d3cc760f7e0a4961 100644 (file)
--- a/configs/sunos5-gcc
+++ b/configs/sunos5-gcc
@@ -4,11 +4,13 @@ include $(TOP)/configs/default
 
 CONFIG_NAME = sunos5-gcc
 
+ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API)
+
 # Compiler and flags
 CC = gcc
 CXX = g++
-CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM
-CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT
+CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM -DUSE_SPARC_ASM
+CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_SPARC_ASM
 GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
 
 GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 1a185bc9c4e27a979451e0ce18d4d67431c126e9..67f797f96eab294d23d5e85e28cd1028de13ac73 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -124,7 +124,7 @@
 #endif
 
 #ifdef USE_SPARC_ASM
-#include "SPARC/sparc.h"
+#include "sparc/sparc.h"
 #endif
 
 #ifndef MESA_VERBOSE

diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index 550c33856b0641644a018cce5499d3611bcccfbf..d0c6bba58e8578c703d8e55b4134151d26f698de 100644 (file)
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -88,9 +88,9 @@ extern GLvector4f  *_mesa_sparc_cliptest_points4_np(GLvector4f *clip_vec,
 
 #define NORM_ARGS      const GLmatrix *mat,                            \
                        GLfloat scale,                                  \
-                       const GLvector3f *in,                           \
+                       const GLvector4f *in,                           \
                        const GLfloat *lengths,                         \
-                       GLvector3f *dest
+                       GLvector4f *dest
 
 extern void _mesa_sparc_transform_normalize_normals(NORM_ARGS);
 extern void _mesa_sparc_transform_normalize_normals_no_rot(NORM_ARGS);
@@ -182,6 +182,3 @@ void _mesa_init_sparc_glapi_relocs(void)
        }
 #endif /* USE_SPARC_ASM */
 }
-
-
-