[Pkg-voip-commits] r9353 - in /asterisk/trunk/debian: changelog patches/series patches/sparc32_disable

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Fri Nov 11 15:49:17 2011
New Revision: 9353

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9353
Log:
Patch sparc32_disable: Remove pointless optimization for sparc64

Added:
    asterisk/trunk/debian/patches/sparc32_disable
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=9353&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Nov 11 15:49:17 2011
@@ -12,13 +12,14 @@
     memory leak. EXPERIMENTAL. DO NOT UPLOAD WITH THIS FOR NOW.
   * Patch reinclude_docs: a copy of the included documentation that was
     removed.
+  * Patch sparc32_disable: Remove pointless optimization for sparc64
 
   [ Paul Belanger ]
   * Bump libpri-dev to 1.4.11.
   * Ensure sub-packages with asterisk modules are the same version as the
     binary.
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 23 Oct 2011 12:22:13 +0200
+ -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 11 Nov 2011 17:48:03 +0200
 
 asterisk (1:1.8.4.4~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=9353&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Fri Nov 11 15:49:17 2011
@@ -23,3 +23,4 @@
 kfreebsd
 
 chan_iax2-detach-thread-on-non-stop-exit
+sparc32_disable

Added: asterisk/trunk/debian/patches/sparc32_disable
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/sparc32_disable?rev=9353&op=file
==============================================================================
--- asterisk/trunk/debian/patches/sparc32_disable (added)
+++ asterisk/trunk/debian/patches/sparc32_disable Fri Nov 11 15:49:17 2011
@@ -1,0 +1,34 @@
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Description: Remove pointless optimization for sparc64
+Forwarded: no
+
+The following code was added to Asterisk mostly at Aug. 2004. At the
+time there was still support for old sparc (non 64 bit ultra-sparc) CPUs
+in the sparc ports. This was dropped after the Woody release.
+
+The -mtune optimization may be worth considering, but certainly not in
+the main Makefile.
+
+See also: https://reviewboard.asterisk.org/r/1534/
+
+--- a/Makefile
++++ b/Makefile
+@@ -168,18 +168,6 @@ ifeq ($(OSARCH),linux-gnu)
+     #PROC=athlon
+   endif
+ 
+-  ifeq ($(PROC),sparc64)
+-    #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-    #This works for even old (2.96) versions of gcc and provides a small boost either way.
+-    #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
+-    #So we go lowest common available by gcc and go a step down, still a step up from
+-    #the default as we now have a better instruction set to work with. - Belgarath
+-    PROC=ultrasparc
+-    OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
+-    OPTIONS+=$(shell if $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v8"; fi)
+-    OPTIONS+=-fomit-frame-pointer
+-  endif
+-
+   ifeq ($(PROC),arm)
+     # The Cirrus logic is the only heavily shipping arm processor with a real floating point unit
+     ifeq ($(SUB_PROC),maverick)