On Tue, Jan 10, 2006 at 08:27:57AM -0800, Linus Torvalds wrote:
>
>
> On Mon, 9 Jan 2006, Sam Ravnborg wrote:
> >
> > Please pull from:
> > ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
>
> Ok, pulled.
>
> However, fixing up a trivial conflict in i386/Makefile, I noticed this:
>
> cflags-$(CONFIG_REGPARM) += $(shell if [ $(call cc-version) -ge 0300 ] ; then \
> echo "-mregparm=3"; fi ;)
>
> and it strikes me that this is WRONG.
>
> It's wrong for some subtle reasons: it means that CONFIG_REGPARM is set
> whether or not it is actually _used_, which means that anybody who depends
> on CONFIG_REGPARM in the sources is just screwed.
>...
The change from Sam's tree conflicted with my patch to completely remove
the version check since we do no longer support any gcc < 3.0.
Patch below.
> Linus
cu
Adrian
<-- snip -->
Since we do no longer support any gcc < 3.0, there's no need to check
for it..
Signed-off-by: Adrian Bunk <[email protected]>
--- linux-2.6.15-mm3-full/arch/i386/Makefile.old 2006-01-13 00:04:09.000000000 +0100
+++ linux-2.6.15-mm3-full/arch/i386/Makefile 2006-01-13 00:05:09.000000000 +0100
@@ -37,10 +37,7 @@
# CPU-specific tuning. Anything which can be shared with UML should go here.
include $(srctree)/arch/i386/Makefile.cpu
-# -mregparm=3 works ok on gcc-3.0 and later
-#
-cflags-$(CONFIG_REGPARM) += $(shell if [ $(call cc-version) -ge 0300 ] ; then \
- echo "-mregparm=3"; fi ;)
+cflags-$(CONFIG_REGPARM) += -mregparm=3
# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
# a lot more stack due to the lack of sharing of stacklots:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
