Minor patch to Makefile and ftola.s (fwd)

[vincent at cojot.name]

Sorry about that, this should have gone to the list.. :)

---------- Forwarded message ----------
Date: Sat, 31 Dec 2005 18:00:17 +0100 (CET)
From: vincent at cojot.name
To: Marc Leeman <marc.leeman at gmail.com>
Subject: Minor patch to Makefile and ftola.s


Hello everyone,

Please apply this patch, that'd be great...

It does the following:

- Changes an #ifdef to an #if in ftola.s (this #ifdef bites on non-i386).
- Re-enables -O3 for Solaris/sparc release building (Solaris/Sparc only).
- Adds a BOTCFLAGS (all arches) but only Solaris defines it to be '-O0'.
(This will make the release version work on Solaris/Sparc until the alignments 
problems in botlib are repaired..)

-- 
,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,
Vincent S. Cojot, Computer Engineering. STEP project. _.,-*~'`^`'~*-,._.,-*~
Ecole Polytechnique de Montreal, Comite Micro-Informatique. _.,-*~'`^`'~*-,.
Linux Xview/OpenLook resources page _.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'
http://step.polymtl.ca/~coyote  _.,-*~'`^`'~*-,._ coyote at NOSPAM4cojot.name

They cannot scare me with their empty spaces
Between stars - on stars where no human race is
I have it in me so much nearer home
To scare myself with my own desert places.       - Robert Frost
-------------- next part --------------
Index: code/unix/ftola.s
===================================================================
--- code/unix/ftola.s	(revision 453)
+++ code/unix/ftola.s	(working copy)
@@ -29,7 +29,7 @@
 
 #include "qasm.h"
 
-#ifdef id386
+#if id386
 
 .data
 
Index: code/unix/Makefile
===================================================================
--- code/unix/Makefile	(revision 453)
+++ code/unix/Makefile	(working copy)
@@ -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 $<