From 1bb760f3471f742730b9cfa91f2301060490c124 Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Mon, 24 Jul 2006 20:58:27 +0000 Subject: Added a small fix to exclude the AMD optimized assembly file from being included in the compile. I don't particular like the approach, which basically tries to exclude the file based on NOT being in a list of arches. This, IMHO, is backwards, it should be a list of AMD arches instead. "Better to light a candle, than to curse the darkness", is apropo here. But since I don't have an exhaustive list of what those arches could be, I leave as-is for now. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38187 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/gsm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 49d2ad372..483875cb6 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -39,7 +39,7 @@ WAV49 = -DWAV49 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 @@ GSM_SOURCES = $(SRC)/add.c \ # 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 -- cgit v1.2.3