? .cvsignore
? changed.txt
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.107
diff -u -r1.107 Makefile
--- Makefile	7 Aug 2004 03:01:52 -0000	1.107
+++ Makefile	31 Aug 2004 00:37:29 -0000
@@ -26,6 +26,11 @@
 #PROC=athlon
 OPTIONS+=-m64
 endif
+ifeq ($(PROC),sparc64)
+PROC=ultrasparc
+CFLAGS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
+endif
+
 endif
 
 ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -116,7 +121,11 @@
 INCLUDE=-Iinclude -I../include
 CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 CFLAGS+=$(OPTIMIZE)
+
+ifneq ($(PROC),ultrasparc)
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+endif
+
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
 
Index: codecs/gsm/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/gsm/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- codecs/gsm/Makefile	22 Jun 2004 17:42:13 -0000	1.15
+++ codecs/gsm/Makefile	31 Aug 2004 00:37:30 -0000
@@ -39,6 +39,7 @@
 
 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
 
 PG =
 #PG = -g -pg
@@ -203,7 +205,9 @@
 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 @@
 		$(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
Index: codecs/lpc10/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- codecs/lpc10/Makefile	22 Jun 2004 17:42:14 -0000	1.11
+++ codecs/lpc10/Makefile	31 Aug 2004 00:37:30 -0000
@@ -25,13 +25,17 @@
 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