Adjust Makefiles to support Ultrasparc architecture (thanks Belgarath) (bug #2319)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3684 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 15 insertions, 4 deletions

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 9105ef4f3..572f61e12 100755
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -39,6 +39,7 @@ WAV49	= -DWAV49
 
 ifneq (${OSARCH},Darwin)
 ifneq (${PROC},x86_64)
+ifneq (${PROC},ultrasparc)
 ifneq ($(shell uname -m),ppc)
 ifneq ($(shell uname -m),alpha)
 OPTIMIZE+=-march=$(PROC)
@@ -46,6 +47,7 @@ endif
 endif
 endif
 endif
+endif
 
 PG =
 #PG = -g -pg
@@ -203,7 +205,9 @@ ifeq (${OSARCH},Linux)
 ifneq ($(shell uname -m),x86_64)
 ifneq ($(shell uname -m),ppc)
 ifneq ($(shell uname -m),alpha)
-GSM_SOURCES+=	$(SRC)/k6opt.s
+ifneq ($(shell uname -m),sparc64)
+GSM_SOURCES+= $(SRC)/k6opt.s
+endif
 endif
 endif
 endif
@@ -252,11 +256,14 @@ GSM_OBJECTS =	$(SRC)/add.o		\
 		$(SRC)/gsm_option.o	\
 		$(SRC)/short_term.o	\
 		$(SRC)/table.o
+
 ifeq (${OSARCH},Linux)
 ifneq ($(shell uname -m), x86_64)
 ifneq ($(shell uname -m), ppc)
 ifneq ($(shell uname -m), alpha)
-GSM_OBJECTS+=	$(SRC)/k6opt.o
+ifneq ($(shell uname -m), sparc64)
+GSM_OBJECTS+= $(SRC)/k6opt.o
+endif
 endif
 endif
 endif
diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile
index cd1e973ef..f747e64a5 100755
--- a/codecs/lpc10/Makefile
+++ b/codecs/lpc10/Makefile
@@ -25,13 +25,17 @@ WARNINGS = -Wall -Wno-comment -Wno-error
 CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
 #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
 
-#fix for PPC processors and ALPHA too
+#fix for PPC processors and ALPHA, And UltraSparc too
 ifneq ($(OSARCH),Darwin)
 ifneq ($(findstring BSD,${OSARCH}),BSD)
 ifneq ($(PROC),ppc)
 ifneq ($(PROC),x86_64)
 ifneq ($(PROC),alpha)
-	CFLAGS+= -march=$(PROC)
+ifeq ($(PROC),ultrasparc)
+        CFLAGS+= -mtune=$(PROC)
+else
+        CFLAGS+= -march=$(PROC)
+endif
 endif
 endif
 endif