automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16577 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 5fb815c504c53dfbe5c1d285addd5c84614fd575..5da9cd465bd99fb80b45bf3fe253351ef42f6e61 100644 (file)
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -40,6 +40,7 @@ WAV49 = -DWAV49
 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)
@@ -62,6 +63,7 @@ endif
 endif
 endif
 endif
+endif
 
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 #This works for even old (2.96) versions of gcc and provides a small boost either way.
@@ -230,6 +232,7 @@ GSM_SOURCES =       $(SRC)/add.c            \
                $(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)
@@ -247,6 +250,7 @@ endif
 endif
 endif
 endif
+endif
 
 TOAST_SOURCES = $(SRC)/toast.c                 \
                $(SRC)/toast_lin.c      \
@@ -294,6 +298,7 @@ GSM_OBJECTS =       $(SRC)/add.o            \
 
 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)
@@ -309,6 +314,7 @@ endif
 endif
 endif
 endif
+endif
 
 TOAST_OBJECTS =        $(SRC)/toast.o          \
                $(SRC)/toast_lin.o      \