Re: [ANNOUNCE] Resync with kbuild 2.5

[Keith Owens <kaos@ocs.com.au>]

On Sat, 8 Jun 2002 14:41:23 +0400, 
Paul P Komkoff Jr <i@stingr.net> wrote:
>kbuild25-3.0-for-2.4.19-pre10-2.bz2
>kbuild25-3.0-for-2.4.19-pre10-ac2-2.bz2
>
>Resynched with latest kbuild 2.5 core-18, which fixes some bugs.
>Unfortunately, sourceforge version of kbuild*i386* still don't contain
>s/CC/CC_real/ "fix" for Makefile.defs.*config. Mine contains.

Thanks for spotting that, the fix did not get backported from 2.5
kernels.  New kbuild 2.5 patches for i386 on 2.4.18 and 2.4.19-pre10
will be on sourceforge soon.  The update against kbuild 2.5
i386-2.4.19-pre10-1 is :-

Index: 19-pre10.2/arch/i386/Makefile.defs.noconfig
--- 19-pre10.2/arch/i386/Makefile.defs.noconfig Fri, 07 Jun 2002 18:29:03 +1000 kaos (linux-2.4/m/f/40_Makefile.d 1.7 644)
+++ 19-pre10.2(w)/arch/i386/Makefile.defs.noconfig Sun, 09 Jun 2002 10:17:43 +1000 kaos (linux-2.4/m/f/40_Makefile.d 1.7 644)
@@ -10,6 +10,8 @@
 # Note: When this is included by the top level Makefile, not all CFLAGS have been
 #       set.  Some CFLAGS cannot be set until after CROSS_COMPILE is stable, in
 #       particular CC still scans user space includes at this point.
+#
+# Use $(CC) in this file, not $(CC_real).
 
 LDFLAGS			+= -m elf_i386
 OBJCOPYFLAGS		+= -O binary -R .note -R .comment -S
Index: 19-pre10.2/arch/i386/Makefile.defs.config
--- 19-pre10.2/arch/i386/Makefile.defs.config Mon, 19 Nov 2001 15:25:43 +1100 kaos (linux-2.4/m/f/41_Makefile.d 1.2 644)
+++ 19-pre10.2(w)/arch/i386/Makefile.defs.config Sun, 09 Jun 2002 10:17:43 +1000 kaos (linux-2.4/m/f/41_Makefile.d 1.2 644)
@@ -11,6 +11,7 @@
 # ifneq ($(subst n,,$(CONFIG_xxx)),) is equivalent to the old
 # ifdef CONFIG_xxx but is CML2 compatible.
 #
+# Use $(CC_real) in this file, not $(CC).
 
 # Negated test, add to cflags if CONFIG_FRAME_POINTER is not set.
 ifeq ($(subst n,,$(CONFIG_FRAME_POINTER)),)
@@ -50,11 +51,11 @@ ifneq ($(subst n,,$(CONFIG_MPENTIUM4)),)
 endif
 
 ifneq ($(subst n,,$(CONFIG_MK6)),)
-  CFLAGS += $(shell if $(CC) -march=k6 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=k6"; else echo "-march=i586"; fi)
+  CFLAGS += $(shell if $(CC_real) -march=k6 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=k6"; else echo "-march=i586"; fi)
 endif
 
 ifneq ($(subst n,,$(CONFIG_MK7)),)
-  CFLAGS += $(shell if $(CC) -march=athlon -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=athlon"; else echo "-march=i686 -malign-functions=4"; fi) 
+  CFLAGS += $(shell if $(CC_real) -march=athlon -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=athlon"; else echo "-march=i686 -malign-functions=4"; fi) 
 endif
 
 ifneq ($(subst n,,$(CONFIG_MCRUSOE)),)