[asterisk-commits] branch 1.2 r16559 - /branches/1.2/codecs/gsm/Makefile

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Mar 30 14:44:05 MST 2006


Author: file
Date: Thu Mar 30 15:44:03 2006
New Revision: 16559

URL: http://svn.digium.com/view/asterisk?rev=16559&view=rev
Log:
Add another check for 64-bit goodness (issue #6850 reported by evilbunny)

Modified:
    branches/1.2/codecs/gsm/Makefile

Modified: branches/1.2/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/codecs/gsm/Makefile?rev=16559&r1=16558&r2=16559&view=diff
==============================================================================
--- branches/1.2/codecs/gsm/Makefile (original)
+++ branches/1.2/codecs/gsm/Makefile Thu Mar 30 15:44:03 2006
@@ -40,6 +40,7 @@
 ifneq (${OSARCH},Darwin)
 ifneq (${OSARCH},SunOS)
 ifneq (${PROC},x86_64)
+ifneq (${PROC},amd64)
 ifneq (${PROC},ultrasparc)
 ifneq ($(shell uname -m),ppc)
 ifneq ($(shell uname -m),ppc64)
@@ -50,6 +51,7 @@
 ifneq (${PROC},ppc)
 ifneq (${PROC},ppc64)
 OPTIMIZE+=-march=$(PROC)
+endif
 endif
 endif
 endif
@@ -230,6 +232,7 @@
 		$(SRC)/table.c
 ifeq (${OSARCH},Linux)
 ifneq ($(shell uname -m),x86_64)
+ifneq ($(shell uname -m),amd64)
 ifneq ($(shell uname -m),ppc)
 ifneq ($(shell uname -m),ppc64)
 ifneq ($(shell uname -m),alpha)
@@ -238,6 +241,7 @@
 ifneq (${PROC},arm)
 ifneq ($(shell uname -m), parisc)
 GSM_SOURCES+= $(SRC)/k6opt.s
+endif
 endif
 endif
 endif
@@ -294,6 +298,7 @@
 
 ifeq (${OSARCH},Linux)
 ifneq ($(shell uname -m), x86_64)
+ifneq ($(shell uname -m), amd64)
 ifneq ($(shell uname -m), ppc)
 ifneq ($(shell uname -m), ppc64)
 ifneq ($(shell uname -m), alpha)
@@ -301,6 +306,7 @@
 ifneq ($(shell uname -m), armv4l)
 ifneq ($(shell uname -m), parisc)
 GSM_OBJECTS+= $(SRC)/k6opt.o
+endif
 endif
 endif
 endif



More information about the asterisk-commits mailing list