[quake3-commits] r1859 - trunk

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-02-06 12:19:06 -0500 (Sun, 06 Feb 2011)
New Revision: 1859

Modified:
   trunk/Makefile
Log:
Fix compilation on alpha, fix by Steve Langasek (#4703)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-02-04 18:23:52 UTC (rev 1858)
+++ trunk/Makefile	2011-02-06 17:19:06 UTC (rev 1859)
@@ -241,8 +241,8 @@
 
 ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
 
-  ifeq ($(ARCH),alpha)
-    ARCH=axp
+  ifeq ($(ARCH),axp)
+    ARCH=alpha
   else
   ifeq ($(ARCH),x86_64)
     LIB=lib64
@@ -310,8 +310,13 @@
     OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
     HAVE_VM_COMPILED=true
   endif
+  ifeq ($(ARCH),alpha)
+    # According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555
+    # -ffast-math will cause the client to die with SIGFPE on Alpha
+    OPTIMIZE = $(OPTIMIZEVM)
   endif
   endif
+  endif
 
   ifneq ($(HAVE_VM_COMPILED),true)
     BASE_CFLAGS += -DNO_VM_COMPILED