Index: Makefile
===================================================================
--- Makefile	(revision 338895)
+++ Makefile	(working copy)
@@ -112,7 +112,7 @@
 _ASTCFLAGS+=$(LIBXML2_INCLUDE)
 
 #Uncomment this to see all build commands instead of 'quiet' output
-#NOISY_BUILD=yes
+NOISY_BUILD=yes
 
 empty:=
 space:=$(empty) $(empty)
@@ -176,7 +176,13 @@
     #the default as we now have a better instruction set to work with. - Belgarath
     PROC=ultrasparc
     OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
-    OPTIONS+=$(shell if $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v8"; fi)
+    OPTIONS+=$(shell \
+	if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then\
+		 echo "-mcpu=v9";\
+	elif $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then\
+		 echo "-mcpu=v8";\
+	fi)
+
     OPTIONS+=-fomit-frame-pointer
   endif
 
@@ -895,7 +901,7 @@
 	-@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 # options for make in menuselect/
-MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="" OPTIONS="$(OPTIONS)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect/menuselect: menuselect/makeopts
 	+$(MAKE_MENUSELECT) menuselect