Use saner default optimizer flags.

2 files changed, 82 insertions, 21 deletions

diff --git a/games/ioquake3/distinfo b/games/ioquake3/distinfo
index a5af9de46a7..1fd0eaf3559 100644
--- a/games/ioquake3/distinfo
+++ b/games/ioquake3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2009/06/06 22:04:50 wiz Exp $
+$NetBSD: distinfo,v 1.4 2013/10/28 23:45:59 joerg Exp $
 
 SHA1 (ioquake3-1.36.tar.bz2) = 0f92891e2b174253d02f666fd22e147c886089b4
 RMD160 (ioquake3-1.36.tar.bz2) = af9f65bbde2fe5531fa371ec6d2023126a523293
 Size (ioquake3-1.36.tar.bz2) = 3503058 bytes
 SHA1 (patch-aa) = 3f89e248cb2e64657f37ccb4f77b837fc7e7a012
 SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2
-SHA1 (patch-ac) = 38834fd3e1b3b1c9dba648ffbc97814c0aaa581a
+SHA1 (patch-ac) = 4631bdda582aa105b661f45e09e0d5eb68713978
 SHA1 (patch-ad) = 577ca1c8fab64289d6f91e9e02542094cf7f2800
diff --git a/games/ioquake3/patches/patch-ac b/games/ioquake3/patches/patch-ac
index 3afcab635f0..a3eb64616df 100644
--- a/games/ioquake3/patches/patch-ac
+++ b/games/ioquake3/patches/patch-ac
@@ -1,8 +1,59 @@
-$NetBSD: patch-ac,v 1.2 2009/03/23 09:57:37 hasso Exp $
+$NetBSD: patch-ac,v 1.3 2013/10/28 23:45:59 joerg Exp $
 
---- Makefile.orig	2009-01-12 19:28:41 +0200
-+++ Makefile	2009-03-23 11:21:16 +0200
-@@ -644,28 +644,217 @@ ifeq ($(PLATFORM),netbsd)
+--- Makefile.orig	2009-04-22 18:54:48.000000000 +0000
++++ Makefile
+@@ -261,16 +261,13 @@ ifeq ($(PLATFORM),linux)
+   OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+ 
+   ifeq ($(ARCH),x86_64)
+-    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
+-      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+-      -fstrength-reduce
++    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
+     # experimental x86_64 jit compiler! you need GNU as
+     HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),i386)
+     OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+-      -funroll-loops -falign-loops=2 -falign-jumps=2 \
+-      -falign-functions=2 -fstrength-reduce
++      -funroll-loops
+     HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+@@ -457,10 +454,7 @@ ifeq ($(PLATFORM),mingw32)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS
+   endif
+ 
+-  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
+-    -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
+-    -fstrength-reduce
+-
++  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math
+   HAVE_VM_COMPILED = true
+ 
+   SHLIBEXT=dll
+@@ -550,8 +544,7 @@ ifeq ($(PLATFORM),freebsd)
+   ifeq ($(ARCH),i386)
+     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
+       -march=pentium -fomit-frame-pointer -pipe -ffast-math \
+-      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+-      -funroll-loops -fstrength-reduce
++      -funroll-loops
+     HAVE_VM_COMPILED=true
+   else
+     BASE_CFLAGS += -DNO_VM_COMPILED
+@@ -611,8 +604,7 @@ ifeq ($(PLATFORM),openbsd)
+   BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include
+   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
+     -march=pentium -fomit-frame-pointer -pipe -ffast-math \
+-    -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+-    -funroll-loops -fstrength-reduce
++    -funroll-loops
+   HAVE_VM_COMPILED=false
+ 
+   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+@@ -648,28 +640,211 @@ ifeq ($(PLATFORM),netbsd)
  
    ifeq ($(shell uname -m),i386)
      ARCH=i386
@@ -38,16 +89,13 @@ $NetBSD: patch-ac,v 1.2 2009/03/23 09:57:37 hasso Exp $
 +  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
 +
 +  ifeq ($(ARCH),x86_64)
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
-+      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-+      -fstrength-reduce
++    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
 +    # experimental x86_64 jit compiler! you need GNU as
 +    HAVE_VM_COMPILED = true
 +  else
 +  ifeq ($(ARCH),i386)
 +    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-+      -funroll-loops -falign-loops=2 -falign-jumps=2 \
-+      -falign-functions=2 -fstrength-reduce
++      -funroll-loops
 +    HAVE_VM_COMPILED=true
 +  else
 +  ifeq ($(ARCH),ppc)
@@ -90,13 +138,13 @@ $NetBSD: patch-ac,v 1.2 2009/03/23 09:57:37 hasso Exp $
 +      CLIENT_LIBS += -lcurl
 +    endif
 +  endif
-+
-+  ifeq ($(USE_CODEC_VORBIS),1)
-+    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
-+  endif
  
 -  BUILD_CLIENT = 0
 -  BUILD_GAME_QVM = 0
++  ifeq ($(USE_CODEC_VORBIS),1)
++    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
++  endif
++
 +  ifeq ($(USE_MUMBLE),1)
 +    CLIENT_LIBS += -lrt
 +  endif
@@ -159,16 +207,13 @@ $NetBSD: patch-ac,v 1.2 2009/03/23 09:57:37 hasso Exp $
 +  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
 +
 +  ifeq ($(ARCH),x86_64)
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
-+      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-+      -fstrength-reduce
++    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
 +    # experimental x86_64 jit compiler! you need GNU as
 +    HAVE_VM_COMPILED = true
 +  else
 +  ifeq ($(ARCH),i386)
 +    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-+      -funroll-loops -falign-loops=2 -falign-jumps=2 \
-+      -falign-functions=2 -fstrength-reduce
++      -funroll-loops
 +    HAVE_VM_COMPILED=true
 +  endif
 +  endif
@@ -227,7 +272,23 @@ $NetBSD: patch-ac,v 1.2 2009/03/23 09:57:37 hasso Exp $
  # SETUP AND BUILD -- IRIX
  #############################################################################
  
-@@ -776,6 +965,7 @@ endif #mingw32
+@@ -727,14 +902,12 @@ ifeq ($(PLATFORM),sunos)
+ 
+   ifeq ($(ARCH),sparc)
+     OPTIMIZE = -O3 -ffast-math \
+-      -fstrength-reduce -falign-functions=2 \
+       -mtune=ultrasparc3 -mv8plus -mno-faster-structs \
+       -funroll-loops #-mv8plus
+   else
+   ifeq ($(ARCH),i386)
+     OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+-      -funroll-loops -falign-loops=2 -falign-jumps=2 \
+-      -falign-functions=2 -fstrength-reduce
++      -funroll-loops
+     HAVE_VM_COMPILED=true
+     BASE_CFLAGS += -m32
+     BASE_CFLAGS += -I/usr/X11/include/NVIDIA
+@@ -780,6 +953,7 @@ endif #mingw32
  endif #FreeBSD
  endif #OpenBSD
  endif #NetBSD