diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-21 14:36:43 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-21 14:36:43 +0000 |
| commit | 2746b4c4bbe3c6970f6cf9893aef5a2e578e7acf (patch) | |
| tree | b6271e5ba75ddb22b489e7c05b09a64b4c18a6ab /codecs/gsm/Makefile | |
| parent | a4c902b217eb40bc898df06e9671f537bb6b2881 (diff) | |
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)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@110476 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/gsm/Makefile')
| -rw-r--r-- | codecs/gsm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index bb783a454..d112a2558 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 |