* [Patch 3/8] S390: Remove 'TOPDIR' from Makefiles
[not found] <20080101071311.GA2496@hacking>
@ 2008-01-01 7:25 ` WANG Cong
2008-01-01 10:17 ` Sam Ravnborg
0 siblings, 1 reply; 7+ messages in thread
From: WANG Cong @ 2008-01-01 7:25 UTC (permalink / raw)
To: Martin Schwidefsky
Cc: LKML, Sam Ravnborg, linux-kbuild, Andrew Morton, linux-s390
TOPDIR is obsolete, use objtree instead.
This patch removes TOPDIR from all s390 Makefiles.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
---
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 56cb710..a753a71 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -34,4 +34,4 @@ obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
#
# This is just to get the dependencies...
#
-binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c
+binfmt_elf32.o: $(objtree)/fs/binfmt_elf.c
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Patch 3/8] S390: Remove 'TOPDIR' from Makefiles
2008-01-01 7:25 ` [Patch 3/8] S390: Remove 'TOPDIR' from Makefiles WANG Cong
@ 2008-01-01 10:17 ` Sam Ravnborg
2008-01-01 13:27 ` (Try #2) [Patch 3/8] S390: Tiny fixes for Makefile WANG Cong
0 siblings, 1 reply; 7+ messages in thread
From: Sam Ravnborg @ 2008-01-01 10:17 UTC (permalink / raw)
To: WANG Cong
Cc: Martin Schwidefsky, LKML, linux-kbuild, Andrew Morton, linux-s390
On Tue, Jan 01, 2008 at 03:25:55PM +0800, WANG Cong wrote:
>
> TOPDIR is obsolete, use objtree instead.
> This patch removes TOPDIR from all s390 Makefiles.
>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>
> ---
>
> diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
> index 56cb710..a753a71 100644
> --- a/arch/s390/kernel/Makefile
> +++ b/arch/s390/kernel/Makefile
> @@ -34,4 +34,4 @@ obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
> #
> # This is just to get the dependencies...
> #
> -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.
Sam
^ permalink raw reply [flat|nested] 7+ messages in thread
* (Try #2) [Patch 3/8] S390: Tiny fixes for Makefile
2008-01-01 10:17 ` Sam Ravnborg
@ 2008-01-01 13:27 ` WANG Cong
2008-01-01 17:42 ` Sam Ravnborg
0 siblings, 1 reply; 7+ messages in thread
From: WANG Cong @ 2008-01-01 13:27 UTC (permalink / raw)
To: Sam Ravnborg
Cc: WANG Cong, Martin Schwidefsky, LKML, linux-kbuild, Andrew Morton,
linux-s390
>> -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 <schwidefsky@de.ibm.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
----
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 56cb710..4accf27 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -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
@@ -34,4 +34,4 @@ obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
#
# This is just to get the dependencies...
#
-binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c
+binfmt_elf.o: $(objtree)/fs/binfmt_elf.c
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: (Try #2) [Patch 3/8] S390: Tiny fixes for Makefile
2008-01-01 13:27 ` (Try #2) [Patch 3/8] S390: Tiny fixes for Makefile WANG Cong
@ 2008-01-01 17:42 ` Sam Ravnborg
2008-01-02 6:42 ` (Try #3) [Patch 3/8] S390: Remove 'TOPDIR' from Makefile WANG Cong
0 siblings, 1 reply; 7+ messages in thread
From: Sam Ravnborg @ 2008-01-01 17:42 UTC (permalink / raw)
To: WANG Cong
Cc: Martin Schwidefsky, LKML, linux-kbuild, Andrew Morton, linux-s390
On Tue, Jan 01, 2008 at 09:27:39PM +0800, WANG Cong wrote:
>
> >> -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 <schwidefsky@de.ibm.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>
> ----
>
> diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
> index 56cb710..4accf27 100644
> --- a/arch/s390/kernel/Makefile
> +++ b/arch/s390/kernel/Makefile
> @@ -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
> @@ -34,4 +34,4 @@ obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
> #
> # This is just to get the dependencies...
> #
> -binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c
> +binfmt_elf.o: $(objtree)/fs/binfmt_elf.c
This is wrong. s390 have a file named binfmt_elf32.c and with this
change it does no longer build.
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.
Sam
^ permalink raw reply [flat|nested] 7+ messages in thread
* (Try #3) [Patch 3/8] S390: Remove 'TOPDIR' from Makefile
2008-01-01 17:42 ` Sam Ravnborg
@ 2008-01-02 6:42 ` WANG Cong
2008-01-02 9:31 ` Martin Schwidefsky
0 siblings, 1 reply; 7+ messages in thread
From: WANG Cong @ 2008-01-02 6:42 UTC (permalink / raw)
To: Sam Ravnborg
Cc: WANG Cong, Martin Schwidefsky, LKML, linux-kbuild, Andrew Morton,
linux-s390
>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.
If I understand you correctly, then the fix should be
the below one.
-------->
This patch removes TOPDIR from arch/s390/kernel/Makefile.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
---
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 56cb710..b3b650a 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -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)
-#
-# This is just to get the dependencies...
-#
-binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: (Try #3) [Patch 3/8] S390: Remove 'TOPDIR' from Makefile
2008-01-02 6:42 ` (Try #3) [Patch 3/8] S390: Remove 'TOPDIR' from Makefile WANG Cong
@ 2008-01-02 9:31 ` Martin Schwidefsky
2008-01-02 9:49 ` Sam Ravnborg
0 siblings, 1 reply; 7+ messages in thread
From: Martin Schwidefsky @ 2008-01-02 9:31 UTC (permalink / raw)
To: WANG Cong; +Cc: Sam Ravnborg, LKML, linux-kbuild, Andrew Morton, linux-s390
On Wed, 2008-01-02 at 14:42 +0800, WANG Cong wrote:
> diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
> index 56cb710..b3b650a 100644
> --- a/arch/s390/kernel/Makefile
> +++ b/arch/s390/kernel/Makefile
> @@ -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)
>
> -#
> -# 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.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: (Try #3) [Patch 3/8] S390: Remove 'TOPDIR' from Makefile
2008-01-02 9:31 ` Martin Schwidefsky
@ 2008-01-02 9:49 ` Sam Ravnborg
0 siblings, 0 replies; 7+ messages in thread
From: Sam Ravnborg @ 2008-01-02 9:49 UTC (permalink / raw)
To: Martin Schwidefsky
Cc: WANG Cong, LKML, linux-kbuild, Andrew Morton, linux-s390
On Wed, Jan 02, 2008 at 10:31:35AM +0100, Martin Schwidefsky wrote:
> On Wed, 2008-01-02 at 14:42 +0800, WANG Cong wrote:
> > diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
> > index 56cb710..b3b650a 100644
> > --- a/arch/s390/kernel/Makefile
> > +++ b/arch/s390/kernel/Makefile
> > @@ -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)
> >
> > -#
> > -# 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.
Thanks Martin.
Sam
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-01-02 9:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20080101071311.GA2496@hacking>
2008-01-01 7:25 ` [Patch 3/8] S390: Remove 'TOPDIR' from Makefiles WANG Cong
2008-01-01 10:17 ` Sam Ravnborg
2008-01-01 13:27 ` (Try #2) [Patch 3/8] S390: Tiny fixes for Makefile WANG Cong
2008-01-01 17:42 ` Sam Ravnborg
2008-01-02 6:42 ` (Try #3) [Patch 3/8] S390: Remove 'TOPDIR' from Makefile WANG Cong
2008-01-02 9:31 ` Martin Schwidefsky
2008-01-02 9:49 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox