[LV-k25-commit] kernel-2.5 Makefile,1.110,1.111

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722

Modified Files:
	Makefile 
Log Message:
Revert the top-level Makefile to pristine condition.  Side effect is that
we will have to start using ARCH=vax on our make command line (or define
ARCH=vax in the environment).  We should get used to doing this anyway,
since we'll have to do it once we merge with mainline.

Of course, VAX hackers are free to locally modify their Makefile to
set ARCH ?= vax, as long as this doesn't get committed to CVS


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- Makefile	27 Mar 2005 23:46:46 -0000	1.110
+++ Makefile	7 Apr 2005 22:56:25 -0000	1.111
@@ -189,8 +189,8 @@
 # Default value for CROSS_COMPILE is not to prefix executables
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
 
-ARCH		?= vax
-CROSS_COMPILE	?= vax-dec-linux-
+ARCH		?= $(SUBARCH)
+CROSS_COMPILE	?=
 
 # Architecture as present in compile.h
 UTS_MACHINE := $(ARCH)
@@ -508,7 +508,7 @@
 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
 CFLAGS		+= -Os
 else
-CFLAGS		+= -O1
+CFLAGS		+= -O2
 endif
 
 #Add align options if CONFIG_CC_* is not equal to 0
@@ -968,7 +968,6 @@
 	$(call cmd,rmfiles)
 	@find . $(RCS_FIND_IGNORE) \
 	 	\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-		-o -name '*.lst' \
 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
 		-type f -print | xargs rm -f