r455 - trunk/code/unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2006-01-03 22:14:01 -0500 (Tue, 03 Jan 2006)
New Revision: 455

Modified:
   trunk/code/unix/Makefile
   trunk/code/unix/ftola.s
Log:
* Solaris fixes


Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2006-01-04 03:12:12 UTC (rev 454)
+++ trunk/code/unix/Makefile	2006-01-04 03:14:01 UTC (rev 455)
@@ -489,9 +489,9 @@
   OPTIMIZE = -O3 -ffast-math -funroll-loops
 
   ifeq ($(ARCH),sparc)
-    OPTIMIZE = -O0 -ffast-math -falign-loops=2 \
+    OPTIMIZE = -O3 -ffast-math -falign-loops=2 \
       -falign-jumps=2 -falign-functions=2 -fstrength-reduce \
-      -mtune=ultrasparc -mv8plus -munaligned-doubles \
+      -mtune=ultrasparc -mv8plus -mno-faster-structs \
       -funroll-loops
     BASE_CFLAGS += -DNO_VM_COMPILED
   else
@@ -513,6 +513,8 @@
   THREAD_LDFLAGS=-lpthread
   LDFLAGS=-lsocket -lnsl -ldl -lm
 
+  BOTCFLAGS=-O0
+
   ifeq ($(USE_SDL),1)
     CLIENT_LDFLAGS=$(shell sdl-config --libs) -L/usr/X11/lib -lGLU -lX11 -lXext
   else
@@ -602,7 +604,7 @@
 
 DO_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $<
 DO_SMP_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $<
-DO_BOT_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DBOTLIB -o $@ -c $<   # $(SHLIBCFLAGS) # bk001212
+DO_BOT_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $<   # $(SHLIBCFLAGS) # bk001212
 DO_DEBUG_CC=$(CC) $(NOTSHLIBCFLAGS) $(DEBUG_CFLAGS) -o $@ -c $<
 DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
 DO_SHLIB_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<

Modified: trunk/code/unix/ftola.s
===================================================================
--- trunk/code/unix/ftola.s	2006-01-04 03:12:12 UTC (rev 454)
+++ trunk/code/unix/ftola.s	2006-01-04 03:14:01 UTC (rev 455)
@@ -29,7 +29,7 @@
 
 #include "qasm.h"
 
-#ifdef id386
+#if id386
 
 .data