From e3ea6829bb357b6fc4fb6e0af1a1ccfc2518aaaf Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Fri, 21 Mar 2008 14:36:17 +0000 Subject: [PATCH] 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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110475 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/gsm/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index bb783a4542..d112a2558f 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -38,7 +38,7 @@ WAV49 = -DWAV49 ######### 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 @@ GSM_SOURCES = $(SRC)/add.c \ # 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 @@ GSM_OBJECTS = $(SRC)/add.o \ 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