[patch 2/2] Set-cflags-before-including-arch-Makefile

[patch 2/2] Set-cflags-before-including-arch-Makefile

[blaisorblade_spam]

Please note that this patch, even if UML-related, should be immediately
discussed for merging in mainline, if possible. The UML patch to handle
this has therefore been separated.

---Patch purpose:
If arch/$(ARCH)/Makefile is included before adding -O2 (and the rest) to
CFLAGS, I must duplicate the addition of it to USER_CFLAGS for UML.
So let's fix this.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---

 uml-linux-2.6.8.1-paolo/Makefile |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff -puN Makefile~Set-cflags-before-including-arch-Makefile Makefile
--- uml-linux-2.6.8.1/Makefile~Set-cflags-before-including-arch-Makefile	2004-08-29 14:40:49.665661448 +0200
+++ uml-linux-2.6.8.1-paolo/Makefile	2004-08-29 14:40:49.668660992 +0200
@@ -428,15 +428,6 @@ else
 include/linux/autoconf.h: ;
 endif
 
-include $(srctree)/arch/$(ARCH)/Makefile
-
-# Default kernel image to build when no specific target is given.
-# KBUILD_IMAGE may be overruled on the commandline or
-# set in the environment
-# Also any assingments in arch/$(ARCH)/Makefiel take precedence over
-# this default value
-export KBUILD_IMAGE ?= vmlinux
-
 # The all: target is the default when no target is given on the
 # command line.
 # This allow a user to issue only 'make' to build a kernel including modules
@@ -460,6 +451,15 @@ endif
 # warn about C99 declaration after statement
 CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
 
+include $(srctree)/arch/$(ARCH)/Makefile
+
+# Default kernel image to build when no specific target is given.
+# KBUILD_IMAGE may be overruled on the commandline or
+# set in the environment
+# Also any assingments in arch/$(ARCH)/Makefiel take precedence over
+# this default value
+export KBUILD_IMAGE ?= vmlinux
+
 #
 # INSTALL_PATH specifies where to place the updated kernel and system map
 # images.  Uncomment if you want to place them anywhere other than root.
_

Re: [patch 2/2] Set-cflags-before-including-arch-Makefile

[Sam Ravnborg]

On Mon, Aug 30, 2004 at 09:48:38PM +0200, blaisorblade_spam@yahoo.it wrote:
> 
> Please note that this patch, even if UML-related, should be immediately
> discussed for merging in mainline, if possible. The UML patch to handle
> this has therefore been separated.
> 
> ---Patch purpose:
> If arch/$(ARCH)/Makefile is included before adding -O2 (and the rest) to
> CFLAGS, I must duplicate the addition of it to USER_CFLAGS for UML.
> So let's fix this.
> 
> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
> ---

Thanks - applied.

	Sam