[asterisk-commits] qwell: branch 1.6.0 r110476 - in /branches/1.6.0: ./ codecs/gsm/Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Mar 21 09:36:43 2008
New Revision: 110476

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110476
Log:
Merged revisions 110475 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r110475 | qwell | 2008-03-21 09:36:17 -0500 (Fri, 21 Mar 2008) | 15 lines

Merged revisions 110474 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r110474 | qwell | 2008-03-21 09:32:52 -0500 (Fri, 21 Mar 2008) | 7 lines

Don't attempt to do optimizations of gsm on mips platforms either.

(closes issue #12270)
Reported by: zandbelt
Patches:
      026-gsm-mips.patch uploaded by zandbelt (license 33)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/codecs/gsm/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/gsm/Makefile?view=diff&rev=110476&r1=110475&r2=110476
==============================================================================
--- branches/1.6.0/codecs/gsm/Makefile (original)
+++ branches/1.6.0/codecs/gsm/Makefile Fri Mar 21 09:36:43 2008
@@ -38,7 +38,7 @@
 ######### probably require gcc. 
 
 ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel ))
+ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
 ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
 OPTIMIZE+=-march=$(PROC)
 endif
@@ -209,7 +209,7 @@
 # XXX should merge with GSM_OBJECTS
 ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel ))
+ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -261,7 +261,7 @@
 
 ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel ))
+ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif