[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2224-5

[Simon McVittie]

The following commit has been merged in the master branch:
commit cc8b63a7eaffa05a2ae6916b5e6d61e60ee9e7eb
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jun 15 12:01:11 2012 +0100

    On any-i386, only emit i486 instructions (we theoretically still support non-586 CPUs), but optimize for a generic modern x86
    
    * On any-i386, only emit i486 instructions (we theoretically still
      support non-586 CPUs), but optimize for a generic modern x86
    * On any-i386, don't use -funroll-loops, working around a compiler
      segfault on these architectures (Closes: #677593)

diff --git a/debian/changelog b/debian/changelog
index 28d228e..9353f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-ioquake3 (1.36+svn2224-5) UNRELEASED; urgency=low
+ioquake3 (1.36+svn2224-5) unstable; urgency=medium
 
   * Add bug number to the previous upload's changelog
   * Add CPPFLAGS (which are not followed by ioquake3) to CFLAGS (which are),
     for better hardening
   * Report status of libgl1-mesa-dri (indirect recommendation) in bug reports
+  * On any-i386, only emit i486 instructions (we theoretically still
+    support non-586 CPUs), but optimize for a generic modern x86
+  * On any-i386, don't use -funroll-loops, working around a compiler
+    segfault on these architectures (Closes: #677593)
 
  -- Simon McVittie <smcv at debian.org>  Fri, 15 Jun 2012 09:11:41 +0100
 
diff --git a/debian/patches/0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch b/debian/patches/0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
new file mode 100644
index 0000000..41a1db6
--- /dev/null
+++ b/debian/patches/0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
@@ -0,0 +1,35 @@
+From 466f75d0022f2b4226009fda1004e2baff973af2 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 15 Jun 2012 11:54:53 +0100
+Subject: [PATCH] Only emit i486 instructions on x86, but optimize for
+ something modern
+
+Debian on i386 theoretically supports 486-class CPUs (e.g. older AMD
+Geode models). Using -march=i486 restricts the compiler to emitting
+opcodes that will work on those CPUs, while -mtune=generic configures
+instruction scheduling to be appropriate for something more modern.
+
+Also disable -funroll-loops and let the compiler decide: this appears
+to work around a compiler segfault on *-i386 in gcc >= 4.7 (#677606).
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 57676a3..c7e7077 100644
+--- a/Makefile
++++ b/Makefile
+@@ -319,8 +319,8 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
+     HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),i386)
+-    OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
+-      -funroll-loops -falign-loops=2 -falign-jumps=2 \
++    OPTIMIZEVM = -O3 -march=i486 -mtune=generic -fomit-frame-pointer \
++      -falign-loops=2 -falign-jumps=2 \
+       -falign-functions=2 -fstrength-reduce
+     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
+     HAVE_VM_COMPILED=true
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 7066512..2181792 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0010-Do-not-reference-a-pak-file-just-because-it-contains.patch
 0011-CVE-2012-3345-write-ioq3.pid-to-home-path-not-temp-d.patch
 0012-CVE-2012-3345-remove-Sys_TempPath-altogether-to-avoi.patch
+0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch

-- 
Quake 3 engine