[asterisk-commits] murf: branch murf/bug_7253_trunk r38186 - /team/murf/bug_7253_trunk/codecs/gsm/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Mon Jul 24 14:52:40 2006
New Revision: 38186

URL: http://svn.digium.com/view/asterisk?rev=38186&view=rev
Log:
 Based on the 1.2 work for this bug, I've made similar changes for trunk.
By the way, I don't know if I really approve of doing it the way it is being done...
Right now, it is basing whether or not to include an optimized .s file written for
AMD chips, by what arch. the current machine does NOT belong to. Seems a bit
backwards, unless we are planning on world domination by AMD soon. This is just
my opinion, but wouldn't it be better to specify the arch's that would be appropriate
instead? A positive thing instead of a negative thing? "Better to light a candle, 
than to curse the darkness", eh?

These additions NOT tested on s390, yet. Works on non-s390 arch.



Modified:
    team/murf/bug_7253_trunk/codecs/gsm/Makefile

Modified: team/murf/bug_7253_trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7253_trunk/codecs/gsm/Makefile?rev=38186&r1=38185&r2=38186&view=diff
==============================================================================
--- team/murf/bug_7253_trunk/codecs/gsm/Makefile (original)
+++ team/murf/bug_7253_trunk/codecs/gsm/Makefile Mon Jul 24 14:52:40 2006
@@ -39,7 +39,7 @@
 
 ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
 ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc ppc64 ia64 s390))
-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l ))
+ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
 OPTIMIZE+=-march=$(PROC)
 endif
 endif
@@ -209,7 +209,7 @@
 # XXX Keep a space after each findstring argument
 # XXX should merge with GSM_OBJECTS
 ifeq (${OSARCH},Linux)
-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
 ifeq (,$(findstring ${PROC} , arm ia64 s390 ))
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif