[PATCH] Remove obsolete HEAD in top Makefile

[PATCH] Remove obsolete HEAD in top Makefile

[Coywolf Qi Hunt]

Hi,

This removes an obsolete variable in the top Makefile. It is used in 2.4 
Makefile.
Now the 2.6 kbuild is no longer using it. I have tested it.

    coywolf


Signed-off-by: Coywolf Qi Hunt <coywolf@greatcn.org>

--- linux-2.6.8/Makefile~remove-HEAD    2004-08-15 05:46:21.215837742 -0400
+++ linux-2.6.8/Makefile        2004-08-15 05:46:41.296231310 -0400
@@ -506,7 +506,6 @@ libs-y              := $(libs-y1) $(libs-y2)
 #       normal descending-into-subdirs phase, since at that time
 #       we cannot yet know if we will need to relink vmlinux.
 #      So we descend into init/ inside the rule for vmlinux again.
-head-y += $(HEAD)
 vmlinux-objs := $(head-y) $(init-y) $(core-y) $(libs-y) $(drivers-y) 
$(net-y)

 quiet_cmd_vmlinux__ = LD      $@

-- 
Coywolf Qi Hunt
Homepage http://greatcn.org/~coywolf/
Admin of http://GreatCN.org and http://LoveCN.org

Re: [PATCH] Remove obsolete HEAD in top Makefile

[Bernd Eckenfels]

In article <411F3A48.2030201@greatcn.org> you wrote:
> Now the 2.6 kbuild is no longer using it. I have tested it.
...
> -head-y += $(HEAD)
> vmlinux-objs := $(head-y) $(init-y) $(core-y) $(libs-y) $(drivers-y) 
> $(net-y)


iff it is not using it you need to remove it in the next line, too.

Gruss
Bernd
-- 
-- 
eckes privat - http://www.eckes.org/
Project Freefire - http://www.freefire.org/

Re: [PATCH] Remove obsolete HEAD in top Makefile

[Coywolf Qi Hunt]

Bernd Eckenfels wrote:

>In article <411F3A48.2030201@greatcn.org> you wrote:
>  
>
>>Now the 2.6 kbuild is no longer using it. I have tested it.
>>    
>>
>...
>  
>
>>-head-y += $(HEAD)
>>vmlinux-objs := $(head-y) $(init-y) $(core-y) $(libs-y) $(drivers-y) 
>>$(net-y)
>>    
>>
>
>
>iff it is not using it you need to remove it in the next line, too.
>  
>

Nah, I'm only removing HEAD, not head-y. :p


-- 
Coywolf Qi Hunt
Homepage http://greatcn.org/~coywolf/
Admin of http://GreatCN.org and http://LoveCN.org

Re: [PATCH] Remove obsolete HEAD in top Makefile

[Bernd Eckenfels]

On Sun, Aug 15, 2004 at 08:36:47PM +0800, Coywolf Qi Hunt wrote:
> >iff it is not using it you need to remove it in the next line, too.
> Nah, I'm only removing HEAD, not head-y. :p

If you remove this line:
head-y += $(HEAD)

then head-y is undefined, and could therefore be removed, too. I dont know
what HEAD was used for, and where does it come from. But since the 2.4 code
uses head in a compareable way (i.e. only in that location with toetally
differen s tructure) I am not sure if it is not needed.

Can you explain what it was used for and why it can be removed now?

Gruss
Bernd
-- 
  (OO)      -- Bernd_Eckenfels@Mörscher_Strasse_8.76185Karlsruhe.de --
 ( .. )      ecki@{inka.de,linux.de,debian.org}  http://www.eckes.org/
  o--o     1024D/E383CD7E  eckes@IRCNet  v:+497211603874  f:+497211606754
(O____O)  When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl!

Re: [PATCH] Remove obsolete HEAD in top Makefile

[Sam Ravnborg]

On Sun, Aug 15, 2004 at 06:26:16PM +0800, Coywolf Qi Hunt wrote:
> Hi,
> 
> This removes an obsolete variable in the top Makefile. It is used in 2.4 
> Makefile.
> Now the 2.6 kbuild is no longer using it. I have tested it.

find -name 'Makefile*' | xargs grep HEAD
identify one user: cris.

Please resend patch with removal in arch/cris/Makefile.

	Sam

Re: [PATCH] Remove obsolete HEAD in top Makefile

[Sam Ravnborg]

On Sun, Aug 15, 2004 at 04:13:42PM +0200, Bernd Eckenfels wrote:
> On Sun, Aug 15, 2004 at 08:36:47PM +0800, Coywolf Qi Hunt wrote:
> > >iff it is not using it you need to remove it in the next line, too.
> > Nah, I'm only removing HEAD, not head-y. :p
> 
> If you remove this line:
> head-y += $(HEAD)
> 
> then head-y is undefined, and could therefore be removed, too. I dont know
> what HEAD was used for, and where does it come from. But since the 2.4 code
> uses head in a compareable way (i.e. only in that location with toetally
> differen s tructure) I am not sure if it is not needed.
> 
> Can you explain what it was used for and why it can be removed now?
HEAD got replaced with head-y sometime in 2.5.
It's about time to rip out the last bits.

About head-y:
>From Documentation/kbuild/makefiles.txt:

   The very first objects linked are listed in head-y, assigned by
      arch/$(ARCH)/Makefile.

And later:

    head-y, init-y, core-y, libs-y, drivers-y, net-y

            $(head-y) list objects to be linked first in vmlinux.
            $(libs-y) list directories where a lib.a archive can be located.
            The rest list directories where a built-in.o object file can be located.
	    
            $(init-y) objects will be located after $(head-y).
            Then the rest follows in this order:
            $(core-y), $(libs-y), $(drivers-y) and $(net-y).
						    

	Sam

[patch] remove obsolete HEAD in kbuild

[Coywolf Qi Hunt]

Sam Ravnborg wrote:

>On Sun, Aug 15, 2004 at 06:26:16PM +0800, Coywolf Qi Hunt wrote:
>  
>
>>Hi,
>>
>>This removes an obsolete variable in the top Makefile. It is used in 2.4 
>>Makefile.
>>Now the 2.6 kbuild is no longer using it. I have tested it.
>>    
>>
>
>find -name 'Makefile*' | xargs grep HEAD
>identify one user: cris.
>
>Please resend patch with removal in arch/cris/Makefile.
>
Signed-off-by: Coywolf Qi Hunt <coywolf@greatcn.org>

 Makefile           |    1 -
 arch/cris/Makefile |    2 --
 2 files changed, 3 deletions(-)

diff -Nrup linux-2.6.8/Makefile linux-2.6.8-cy/Makefile
--- linux-2.6.8/Makefile	2004-08-15 05:46:21.000000000 -0400
+++ linux-2.6.8-cy/Makefile	2004-08-15 05:46:41.000000000 -0400
@@ -506,7 +506,6 @@ libs-y		:= $(libs-y1) $(libs-y2)
 #       normal descending-into-subdirs phase, since at that time
 #       we cannot yet know if we will need to relink vmlinux.
 #	So we descend into init/ inside the rule for vmlinux again.
-head-y += $(HEAD)
 vmlinux-objs := $(head-y) $(init-y) $(core-y) $(libs-y) $(drivers-y) $(net-y)
 
 quiet_cmd_vmlinux__ = LD      $@
diff -Nrup linux-2.6.8/arch/cris/Makefile linux-2.6.8-cy/arch/cris/Makefile
--- linux-2.6.8/arch/cris/Makefile	2004-08-15 20:58:18.673278888 -0400
+++ linux-2.6.8-cy/arch/cris/Makefile	2004-08-15 20:59:30.109679014 -0400
@@ -39,8 +39,6 @@ CFLAGS := $(subst -fomit-frame-pointer,,
 CFLAGS += -fno-omit-frame-pointer
 endif
 
-HEAD := arch/$(ARCH)/$(SARCH)/kernel/head.o
-
 LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
 
 core-y		+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/


-- 
Coywolf Qi Hunt
Homepage http://greatcn.org/~coywolf/
Admin of http://GreatCN.org and http://LoveCN.org

Re: [patch] remove obsolete HEAD in kbuild

[Sam Ravnborg]

On Mon, Aug 16, 2004 at 10:06:34AM +0800, Coywolf Qi Hunt wrote:
> diff -Nrup linux-2.6.8/arch/cris/Makefile linux-2.6.8-cy/arch/cris/Makefile
> --- linux-2.6.8/arch/cris/Makefile	2004-08-15 20:58:18.673278888 -0400
> +++ linux-2.6.8-cy/arch/cris/Makefile	2004-08-15 20:59:30.109679014 -0400
> @@ -39,8 +39,6 @@ CFLAGS := $(subst -fomit-frame-pointer,,
> CFLAGS += -fno-omit-frame-pointer
> endif
> 
> -HEAD := arch/$(ARCH)/$(SARCH)/kernel/head.o
> -
> LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
> 
> core-y		+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/

When you remove assignment to HEAD you need to replace 
it with assignment to head-y.

	Sam

Re: [patch] remove obsolete HEAD in kbuild

[Coywolf Qi Hunt]

Sam Ravnborg wrote:

>On Mon, Aug 16, 2004 at 10:06:34AM +0800, Coywolf Qi Hunt wrote:
>  
>
>>diff -Nrup linux-2.6.8/arch/cris/Makefile linux-2.6.8-cy/arch/cris/Makefile
>>--- linux-2.6.8/arch/cris/Makefile	2004-08-15 20:58:18.673278888 -0400
>>+++ linux-2.6.8-cy/arch/cris/Makefile	2004-08-15 20:59:30.109679014 -0400
>>@@ -39,8 +39,6 @@ CFLAGS := $(subst -fomit-frame-pointer,,
>>CFLAGS += -fno-omit-frame-pointer
>>endif
>>
>>-HEAD := arch/$(ARCH)/$(SARCH)/kernel/head.o
>>-
>>LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
>>
>>core-y		+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/
>>    
>>
>
>When you remove assignment to HEAD you need to replace 
>it with assignment to head-y.
>

No, we needn't. Some archs do not have head-y. They use core-y for head.o .


-- 
Coywolf Qi Hunt
Homepage http://greatcn.org/~coywolf/
Admin of http://GreatCN.org and http://LoveCN.org

Re: [patch] remove obsolete HEAD in kbuild

[Sam Ravnborg]

On Tue, Aug 17, 2004 at 12:11:14PM +0800, Coywolf Qi Hunt wrote:
> Sam Ravnborg wrote:
> 
> >On Mon, Aug 16, 2004 at 10:06:34AM +0800, Coywolf Qi Hunt wrote:
> > 
> >
> >>diff -Nrup linux-2.6.8/arch/cris/Makefile 
> >>linux-2.6.8-cy/arch/cris/Makefile
> >>--- linux-2.6.8/arch/cris/Makefile	2004-08-15 20:58:18.673278888 -0400
> >>+++ linux-2.6.8-cy/arch/cris/Makefile	2004-08-15 
> >>20:59:30.109679014 -0400
> >>@@ -39,8 +39,6 @@ CFLAGS := $(subst -fomit-frame-pointer,,
> >>CFLAGS += -fno-omit-frame-pointer
> >>endif
> >>
> >>-HEAD := arch/$(ARCH)/$(SARCH)/kernel/head.o
> >>-
> >>LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
> >>
> >>core-y		+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/
> >>   
> >>
> >
> >When you remove assignment to HEAD you need to replace 
> >it with assignment to head-y.
> >
> 
> No, we needn't. Some archs do not have head-y. They use core-y for head.o .
Looked and could not find it...
Adding head.o to extra-y does not get it compiled in.
To compile it in it needs to be listed in obj-y, and do not
confuse the three different head.S files.

	Sam

Re: [patch] remove obsolete HEAD in kbuild

[Coywolf Qi Hunt]

Sam Ravnborg wrote:

>On Tue, Aug 17, 2004 at 12:11:14PM +0800, Coywolf Qi Hunt wrote:
>  
>
>>No, we needn't. Some archs do not have head-y. They use core-y for head.o .
>>    
>>

Sorry for my wrongness.

I felt _quit_ sure when I was saying that stupidity in the morning when 
I just woke up.
I was hesitating to look into it, but I didn't. It seemed so real to me 
then.
Maybe I dreamed I found that. It's possible for one who thinks of kernel 
issuses day to day.

What a shame. I nearly break kbuild on cris. :-(

>Looked and could not find it...
>Adding head.o to extra-y does not get it compiled in.
>To compile it in it needs to be listed in obj-y, and do not
>confuse the three different head.S files.
>
>	Sam
>

Makefile: remove obsolete HEAD
arch/cris/Makefile: replace HEAD with assignment to head-y


Signed-off-by: Coywolf Qi Hunt <coywolf@greatcn.org>

 Makefile           |    1 -
 arch/cris/Makefile |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
diff -Nrup linux-2.6.8/Makefile linux-2.6.8-cy/Makefile
--- linux-2.6.8/Makefile	2004-08-15 05:46:21.000000000 -0400
+++ linux-2.6.8-cy/Makefile	2004-08-15 05:46:41.000000000 -0400
@@ -506,7 +506,6 @@ libs-y		:= $(libs-y1) $(libs-y2)
 #       normal descending-into-subdirs phase, since at that time
 #       we cannot yet know if we will need to relink vmlinux.
 #	So we descend into init/ inside the rule for vmlinux again.
-head-y += $(HEAD)
 vmlinux-objs := $(head-y) $(init-y) $(core-y) $(libs-y) $(drivers-y) $(net-y)
 
 quiet_cmd_vmlinux__ = LD      $@
diff -Nrup linux-2.6.8/arch/cris/Makefile linux-2.6.8-cy/arch/cris/Makefile
--- linux-2.6.8/arch/cris/Makefile	2004-08-15 20:58:18.000000000 -0400
+++ linux-2.6.8-cy/arch/cris/Makefile	2004-08-17 22:48:39.671201824 -0400
@@ -39,7 +39,7 @@ CFLAGS := $(subst -fomit-frame-pointer,,
 CFLAGS += -fno-omit-frame-pointer
 endif
 
-HEAD := arch/$(ARCH)/$(SARCH)/kernel/head.o
+head-y := arch/$(ARCH)/$(SARCH)/kernel/head.o
 
 LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)


-- 
Coywolf Qi Hunt
Homepage http://greatcn.org/~coywolf/
Admin of http://GreatCN.org and http://LoveCN.org

Re: [patch] remove obsolete HEAD in kbuild

[Sam Ravnborg]

On Wed, Aug 18, 2004 at 01:09:11PM +0800, Coywolf Qi Hunt wrote:
> 
> Makefile: remove obsolete HEAD
> arch/cris/Makefile: replace HEAD with assignment to head-y

Thanks, applied.

	Sam