Remove 'TOPDIR' from Makefiles

TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all UML Makefiles.

Quoted 4 lines · WANG Cong

TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all UML Makefiles.

I do not feel confident with these changes.
In some places I had expected to see srctree and not objtree. I would like to see this tested before applying it.

Building a ppc toolchain now to test it...

Quoted 11 lines · Sam Ravnborg

Quoted 4 lines · WANG Cong

TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all UML Makefiles.

I do not feel confident with these changes.
In some places I had expected to see srctree and not objtree. I would like to see this tested before applying it.

Building a ppc toolchain now to test it...

It seems that building a ppc based um kernel is not supported in mainline.
Kconfig.ppc is missing and when creating it um build fails in sys-ppc/ due to user-offset.c is missing.

As most of your patch touches ppc specific code I suggest
to just replace TOPDIR with srctree all over (no semantic change) and the the um people can figure out the ppc stuff when they get to it.

TOPDIR is obsolete, use srctree instead.
This patch removes TOPDIR from all UML Makefiles.

Quoted 2 lines · WANG Cong

TOPDIR is obsolete, use srctree instead.
This patch removes TOPDIR from all UML Makefiles.

Thanks, I'll send this to Andrew.

TOPDIR is obsolete, use objtree instead. This patch removes TOPDIR from all Mips Makefiles.

Cc Ralf Baechle <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

---

arch/mips/lasat/image/Makefile +0 -0

index 5332449..5196962 100644

Review

Quoted 3 lines

(quoted diff) +1 -1

-KERNEL_IMAGE = $(TOPDIR)/vmlinux
+KERNEL_IMAGE = $(objtree)/vmlinux

Current directory when building is $(objtree) so here we should just skip the use of TOPDIR like this:

Review HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ · line 27

Quoted 12 lines

(quoted diff) +2 -1

+KERNEL_IMAGE = vmlinux
 
 
 KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )
 KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )

@@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
 		-D TIMESTAMP=$(shell date +%s)
 
 $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
-	$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
+	$(CC) -fno-pic $(HEAD_DEFINES) -I$(objtree)/include -c -o $@ $<

This has never worked with O=.. builds.
The correct fix here is to use:

Review HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ · line 28

Quoted 1 line

(quoted diff) +1 -0

+	$(CC) -fno-pic $(HEAD_DEFINES) -Iinclude -Iinclude2 -c -o $@ $<

The -Iinclude2 is only for O=... builds so to keep current behaviour removing $(TOPDIR)/ would do it.

arch/mips/lasat/image/Makefile HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ · line 27

Quoted 6 lines

arch/mips/lasat/image/Makefile +1 -1

@@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
 		-D TIMESTAMP=$(shell date +%s)
 
 $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
-	$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
+	$(CC) -fno-pic $(HEAD_DEFINES) -I$(objtree)/include -c -o $@ $<

This has never worked with O=.. builds.
The correct fix here is to use:

Review HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ · line 28

Quoted 1 line

(quoted diff) +1 -0

+	$(CC) -fno-pic $(HEAD_DEFINES) -Iinclude -Iinclude2 -c -o $@ $<

The -Iinclude2 is only for O=... builds so to keep current behaviour removing $(TOPDIR)/ would do it.

Quoted 8 lines · Sam Ravnborg

arch/mips/lasat/image/Makefile HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ · line 27

Quoted 6 lines

arch/mips/lasat/image/Makefile +1 -1

@@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
 		-D TIMESTAMP=$(shell date +%s)
 
 $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
-	$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
+	$(CC) -fno-pic $(HEAD_DEFINES) -I$(objtree)/include -c -o $@ $<

This has never worked with O=.. builds.
The correct fix here is to use:

Quoted 4 lines

Review HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ · line 28

Quoted 1 line

(quoted diff) +1 -0

+	$(CC) -fno-pic $(HEAD_DEFINES) -Iinclude -Iinclude2 -c -o $@ $<

The -Iinclude2 is only for O=... builds so to keep current behaviour removing $(TOPDIR)/ would do it.

Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?

Quoted 3 lines

Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?

It would be better to use $(LINUXINCLUDE) as we then pull in all config symbols too and do not have to hardcode kbuild internal names (include2).

Quoted 5 lines

Quoted 3 lines

Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?

It would be better to use $(LINUXINCLUDE) as we then pull in all config symbols too and do not have to hardcode kbuild internal names (include2).

OK. Refine this patch.

----------->

Since TOPDIR is obsolete, this patch removes TOPDIR from the Mips Makefiles.

Cc Ralf Baechle <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

Quoted 3 lines

Quoted 1 line

Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?

It would be better to use $(LINUXINCLUDE) as we then pull in all config symbols too and do not have to hardcode kbuild internal names (include2).

OK. Refine this patch.

Quoted 4 lines · WANG Cong

Quoted 3 lines

Quoted 1 line

Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?

It would be better to use $(LINUXINCLUDE) as we then pull in all config symbols too and do not have to hardcode kbuild internal names (include2).

Quoted 1 line

OK. Refine this patch.

LDSCRIPT also needed fixing to get builds in a separate object directory working again.

I've applied below fix.

Ralf

From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001
From: WANG Cong <[email protected]>
Date: Wed, 2 Jan 2008 14:21:36 +0800
Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory.

Signed-off-by WANG Cong <[email protected]>

[Ralf: The LDSCRIPT script needed fixing, too]

Signed-off-by Ralf Baechle <[email protected]>

arch/mips/lasat/image/Makefile +0 -0

index 5332449..7ccd40d 100644

arch/mips/lasat/image/Makefile +1 -1

 HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
 		-D_kernel_entry=0x$(KERNEL_ENTRY) \

@@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
 		-D TIMESTAMP=$(shell date +%s)
 
 $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
-	$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
+	$(CC) -fno-pic $(HEAD_DEFINES) $(LINUXINCLUDE) -c -o $@ $<
 
 OBJECTS = head.o kImage.o
 

Quoted 6 lines · Ralf Baechle

Quoted 4 lines · WANG Cong

Quoted 3 lines

Quoted 1 line

Shouldn't that use $(LINUXINCLUDE), or $(KBUILD_CPPFLAGS)?

It would be better to use $(LINUXINCLUDE) as we then pull in all config symbols too and do not have to hardcode kbuild internal names (include2).

Quoted 6 lines

Quoted 1 line

OK. Refine this patch.

LDSCRIPT also needed fixing to get builds in a separate object directory working again.

I've applied below fix.

Great - I will drop it from my tree.

See small comment below.

Sam

Quoted 18 lines

Ralf

From 8babf06e1265214116fb8ffc634c04df85597c52 Mon Sep 17 00:00:00 2001
From: WANG Cong <[email protected]>
Date: Wed, 2 Jan 2008 14:21:36 +0800
Subject: [PATCH] [MIPS] Lasat: Fix built in separate object directory.

Signed-off-by WANG Cong <[email protected]>

[Ralf: The LDSCRIPT script needed fixing, too]

Signed-off-by Ralf Baechle <[email protected]>

arch/mips/lasat/image/Makefile +0 -0

index 5332449..7ccd40d 100644

arch/mips/lasat/image/Makefile endif · line 19

Quoted 10 lines

arch/mips/lasat/image/Makefile +2 -2

@@ -12,11 +12,11 @@ endif
 
 MKLASATIMG = mklasatimg
 MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200
-KERNEL_IMAGE = $(TOPDIR)/vmlinux
+KERNEL_IMAGE = vmlinux
 KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )
 KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )
 
-LDSCRIPT= -L$(obj) -Tromscript.normal
+LDSCRIPT= -L$(srctree)/$(obj) -Tromscript.normal

This needs to read:

arch/mips/lasat/image/Makefile endif · line 20

Quoted 1 line

arch/mips/lasat/image/Makefile +1 -0

+LDSCRIPT= -L$(srctree)/$(src) -Tromscript.normal

(There is no difference between src and obj in normal cases but to be consistent it shuld be like above).

TOPDIR is obsolete, use objtree instead. This patch removes TOPDIR from all s390 Makefiles.

Cc Martin Schwidefsky <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

---

arch/s390/kernel/Makefile +0 -0

index 56cb710..a753a71 100644

Review

Quoted 3 lines

(quoted diff) +1 -1

-binfmt_elf32.o:	$(TOPDIR)/fs/binfmt_elf.c
+binfmt_elf32.o:	$(objtree)/fs/binfmt_elf.c

This prerequisite listing looks just bogus and should be removed altogether. We only need to list prerequisites explicit for generated files.

Quoted 6 lines

Review

Quoted 3 lines

(quoted diff) +1 -1

-binfmt_elf32.o:	$(TOPDIR)/fs/binfmt_elf.c
+binfmt_elf32.o:	$(objtree)/fs/binfmt_elf.c

This prerequisite listing looks just bogus and should be removed altogether. We only need to list prerequisites explicit for generated files.

Not so sure whether this is what s390 people do on purpose. Thanks anyway!

The following one contains the new fix.

------------>

This patch removes TOPDIR and fixes a bogus prerequisite in arch/s390/kernel/Makefile.

Cc Martin Schwidefsky <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

----

arch/s390/kernel/Makefile +1 -1

index 56cb710..4accf27 100644
@@ -20,7 +20,7 @@ obj-$(CONFIG_AUDIT)		+= audit.o
 compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o
 obj-$(CONFIG_COMPAT)		+= compat_linux.o compat_signal.o \
 					compat_wrapper.o compat_exec_domain.o \
-					binfmt_elf32.o $(compat-obj-y)
+					binfmt_elf.o $(compat-obj-y)
 
 obj-$(CONFIG_VIRT_TIMER)	+= vtime.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

If the output file does not exist then kbuild does not care about the dependencies and will just build the target.
On the second invocation when the target exists then kbuild has created a file named .<target>.cmd that list the dependencies and this includes any included .c file.
So there is just no pint in defining this dependency explicit in the MAkefile - kbuild will figure it out automatically.

The right fix is just to kill the explicit listed dependency.

Quoted 9 lines · WANG Cong

arch/s390/kernel/Makefile +0 -0

index 56cb710..b3b650a 100644
@@ -31,7 +31,3 @@ S390_KEXEC_OBJS := machine_kexec.o crash.o
 S390_KEXEC_OBJS += $(if
 $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
 obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)

arch/s390/kernel/Makefile S390_KEXEC_OBJS := machine_kexec.o crash.o · line 37

Quoted 4 lines

arch/s390/kernel/Makefile +0 -4

-#
-# This is just to get the dependencies...
-#
-binfmt_elf32.o:        $(TOPDIR)/fs/binfmt_elf.c

This one is correct. I'll add it to git390.

TOPDIR is obsolete, use objtree instead. This patch removes TOPDIR from all Cris Makefiles.

Cc Mikael Starvik <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

---

arch/cris/arch-v32/boot/compressed/Makefile +0 -0

index 9f77eda..8586922 100644

Review

Quoted 3 lines

(quoted diff) +1 -1

-CC = gcc-cris -mlinux -march=v32 -I $(TOPDIR)/include
+CC = gcc-cris -mlinux -march=v32 -I $(objtree)/include

As in the mips case the right fix is to use:

Quoted 1 line

+CC = gcc-cris -mlinux -march=v32 -Iinclude -Iinclude2

In this way we pick up the includes also in the O=.. case.

Refine it as suggested by Andreas.

-------->

This patch removes TOPDIR from Cris Makefiles.

Cc Mikael Starvik <[email protected]>

Cc Sam Ravnborg <[email protected]>

Cc Andreas Schwab <[email protected]>

Signed-off-by WANG Cong <[email protected]>

Quoted 6 lines · WANG Cong

Refine it as suggested by Andreas.

-------->

This patch removes TOPDIR from Cris Makefiles.

Quoted 4 lines

Cc Mikael Starvik <[email protected]>

Cc Sam Ravnborg <[email protected]>

Cc Andreas Schwab <[email protected]>

Signed-off-by WANG Cong <[email protected]>

Added Jesper to Cc and applied.

Sam

Quoted 4 lines · Sam Ravnborg

Quoted 3 lines · WANG Cong

Refine it as suggested by Andreas.

Quoted 3 lines

Quoted 3 lines

-------->

This patch removes TOPDIR from Cris Makefiles.

We had the TOPDIR replaced with $(srcdir) already, but this looks better.

Compiles OK for both EtraxFS and ARTPEC-3 cpus in our tree.

TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all infiniband Makefiles.

Cc Sam Ravnborg <[email protected]>

Cc Roland Dreier <[email protected]>

Cc Sean Hefty <[email protected]>

Cc Hal Rosenstock <[email protected]>

Signed-off-by WANG Cong <[email protected]>

---

drivers/infiniband/hw/cxgb3/Makefile +0 -0

index 36b9898..b82286a 100644

Review

Quoted 5 lines

(quoted diff) +1 -2

-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3 \
-		-I$(TOPDIR)/drivers/infiniband/hw/cxgb3/core
 
+EXTRA_CFLAGS += -I$(objtree)/drivers/net/cxgb3 \

Drop $(TOPDIR) like this:

Review

Quoted 3 lines

(quoted diff) +2 -0

+EXTRA_CFLAGS += -Idrivers/net/cxgb3 \
 
+		-I$(objtree)/drivers/infiniband/hw/cxgb3/core

And this line can be deleted - there is no such directory. At least not in my tree.

Quoted 11 lines

drivers/infiniband/hw/cxgb3/Makefile

Quoted 5 lines

drivers/infiniband/hw/cxgb3/Makefile +1 -2

-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3 \
-		-I$(TOPDIR)/drivers/infiniband/hw/cxgb3/core
 
+EXTRA_CFLAGS += -I$(objtree)/drivers/net/cxgb3 \

Drop $(TOPDIR) like this:

Review

Quoted 3 lines

(quoted diff) +2 -0

+EXTRA_CFLAGS += -Idrivers/net/cxgb3 \
 
+		-I$(objtree)/drivers/infiniband/hw/cxgb3/core

And this line can be deleted - there is no such directory. At least not in my tree.

Yes, correct. Thank you.

----------->

This patch removes TOPDIR from infiniband Makefiles.

Cc Sam Ravnborg <[email protected]>

Cc Roland Dreier <[email protected]>

Cc Sean Hefty <[email protected]>

Cc Hal Rosenstock <[email protected]>

Signed-off-by WANG Cong <[email protected]>

TOPDIR is obsolete, use objtree instead. This patch removes TOPDIR from all frv Makefiles.

Cc David Howells <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

---

arch/frv/boot/Makefile +2 -2

index dc6f038..d93f768 100644
@@ -10,7 +10,7 @@
 
 targets := Image zImage bootpImage
 
-SYSTEM	=$(TOPDIR)/$(LINUX)
+SYSTEM	=$(objtree)/$(LINUX)
 
 ZTEXTADDR	 = 0x02080000
 PARAMS_PHYS	 = 0x0207c000

@@ -45,7 +45,7 @@ zImage:	$(CONFIGURE) compressed/$(LINUX)
 bootpImage: bootp/bootp
 	$(OBJCOPY) -O binary -R .note -R .comment -S bootp/bootp $@
 
-compressed/$(LINUX): $(TOPDIR)/$(LINUX) dep
+compressed/$(LINUX): $(objtree)/$(LINUX) dep
 	@$(MAKE) -C compressed $(LINUX)
 
 bootp/bootp: zImage initrd

In this file we can just drop use of $(TOPDIR) since this is our current directory anyway.

Quoted 3 lines

In this file we can just drop use of $(TOPDIR) since this is our current directory anyway.

Thanks!

-------->

This patch drops TOPDIR from frv Makefiles.

Cc David Howells <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

TOPDIR is obsolete, use objtree instead. This patch removes TOPDIR from all fs/ Makefiles.

Cc Alexander Viro <[email protected]>

Cc Tim Shimmin <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

---

fs/smbfs/Makefile +1 -1

index 6673ee8..9b5e92b 100644
@@ -34,5 +34,5 @@ proto:
 	@echo >> proto2.h "struct sock;"
 	@echo >> proto2.h "struct statfs;"
 	@echo >> proto2.h ""
-	cproto -E "gcc -E" -e -v -I $(TOPDIR)/include -DMAKING_PROTO -D__KERNEL__ $(SRC) >> proto2.h
+	cproto -E "gcc -E" -e -v -I $(objtree)/include -DMAKING_PROTO -D__KERNEL__ $(SRC) >> proto2.h
 	mv proto2.h proto.h

fs/xfs/Makefile +0 -0

index 49e3e7e..d1d3d49 100644

The whole "Maintainer rules" part of this file should be deleted. I cannot see how it can be used anyway.

Quoted 4 lines

The whole "Maintainer rules" part of this file should be deleted. I cannot see how it can be used anyway.

Agreed.

I delete them all and renew the patch.
Passed compiling test.

--------->

This patch drops TOPDIR since it's obsolete and removes some dead code from fs/smbfs/Makefile.

Cc Alexander Viro <[email protected]>

Cc Tim Shimmin <[email protected]>

Cc Sam Ravnborg <[email protected]>

Signed-off-by WANG Cong <[email protected]>

Quoted 2 lines · WANG Cong

TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all fs/ Makefiles.

fs/xfs/Makefile line 1

Quoted 7 lines

fs/xfs/Makefile +1 -1

index 49e3e7e..d1d3d49 100644
@@ -1 +1 @@
-include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)
+include $(objtree)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)

FWIW $(TOPDIR) is already banished from the latest xfs build code:

http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/Makefile

and the patch is in -mm too via git:

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc6/2.6.24-rc6-mm1/broken-out/git-xfs.patch

p.s. what is $(objtree) exactly? I don't see it mentioned in Documentation/kbuild except as one line in an example... I thought $(obj) and $(src) should be used outside of the core kbuild infrastructure, and in this case wouldn't it be $(src) anyway?

Quoted 4 lines · Eric Sandeen

Quoted 2 lines · WANG Cong

TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all fs/ Makefiles.

Quoted 10 lines

fs/xfs/Makefile line 1

Quoted 7 lines

fs/xfs/Makefile +1 -1

index 49e3e7e..d1d3d49 100644
@@ -1 +1 @@
-include $(TOPDIR)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)
+include $(objtree)/fs/xfs/Makefile-linux-$(VERSION).$(PATCHLEVEL)

FWIW $(TOPDIR) is already banished from the latest xfs build code:

Good - I will ignore the xfs bits.

TOPDIR is obsolete, use srctree or objtree instead.

TOPDIR is obsolete, use srctree or objtree instead.

This patch set removes all the TOPDIR use in the whole source tree and finally drops it in the top Makefile. They're against the current linus-tree.

Note that Patch [8/8] should be applied _after_ all the previous patches are applied.

Hi Wang.

You a heads up. I will most likely apply
the remaining of the patches tonight, except the UM stuff which I hope Jeff to take and the final removal of TOPDIR may wait a bit.
I want the s390, xfs and um changes to hit -mm at least and we have several external modules that uses TOPDIR.

And some of these external modules I care about - not all of them but some of them.

Sam