[v2,2/2] kbuild: Remove stale asm-generic wrappers
diff mbox

Message ID 1453210670-12596-3-git-send-email-james.hogan@imgtec.com
State New
Headers show

Commit Message

James Hogan Jan. 19, 2016, 1:37 p.m. UTC
When a header file is removed from generic-y (often accompanied by the
addition of an arch specific header), the generated wrapper file will
persist, and in some cases may still take precedence over the new arch
header.

For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
context") removed ucontext.h from generic-y in arch/mips/include/asm/,
and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
the wrapper when reusing a dirty build tree resulted in build failures
in arch/mips/kernel/signal.c:

arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
  return &uc->uc_extcontext;
            ^

Fix by detecting and removing wrapper headers in generated header
directories that do not correspond to a filename in generic-y, genhdr-y,
or the newly introduced generated-y.

Reported-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Michal Marek <mmarek@suse.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-kbuild@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-mips@linux-mips.org
---
Changes in v2:
- Rewrite a bit, drawing inspiration from Makefile.headersinst.
- Exclude genhdr-y and generated-y (thanks to kbuild test robot).
---
 scripts/Makefile.asm-generic | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Arnd Bergmann Jan. 19, 2016, 2:09 p.m. UTC | #1
On Tuesday 19 January 2016 13:37:50 James Hogan wrote:
> When a header file is removed from generic-y (often accompanied by the
> addition of an arch specific header), the generated wrapper file will
> persist, and in some cases may still take precedence over the new arch
> header.
> 
> For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> the wrapper when reusing a dirty build tree resulted in build failures
> in arch/mips/kernel/signal.c:
> 
> arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
>   return &uc->uc_extcontext;
>             ^
> 
> Fix by detecting and removing wrapper headers in generated header
> directories that do not correspond to a filename in generic-y, genhdr-y,
> or the newly introduced generated-y.

Good idea.

Acked-by: Arnd Bergmann <arnd@arndb.de>

Can you merge this through the mips tree, or do you need me to pick it
up through asm-generic?
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
James Hogan Jan. 19, 2016, 2:22 p.m. UTC | #2
On Tue, Jan 19, 2016 at 03:09:14PM +0100, Arnd Bergmann wrote:
> On Tuesday 19 January 2016 13:37:50 James Hogan wrote:
> > When a header file is removed from generic-y (often accompanied by the
> > addition of an arch specific header), the generated wrapper file will
> > persist, and in some cases may still take precedence over the new arch
> > header.
> > 
> > For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> > context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> > and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> > the wrapper when reusing a dirty build tree resulted in build failures
> > in arch/mips/kernel/signal.c:
> > 
> > arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> > arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
> >   return &uc->uc_extcontext;
> >             ^
> > 
> > Fix by detecting and removing wrapper headers in generated header
> > directories that do not correspond to a filename in generic-y, genhdr-y,
> > or the newly introduced generated-y.
> 
> Good idea.
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Thanks Arnd

> Can you merge this through the mips tree, or do you need me to pick it
> up through asm-generic?

I was envisaging the kbuild tree tbh, but I don't really mind how it
gets merged. This patch depends on patch 1, which adds generated-y to
x86 so we don't delete their other generated headers, but other than
that it doesn't really have any dependencies.

Cheers
James
Arnd Bergmann Jan. 19, 2016, 2:27 p.m. UTC | #3
On Tuesday 19 January 2016 14:22:13 James Hogan wrote:
> On Tue, Jan 19, 2016 at 03:09:14PM +0100, Arnd Bergmann wrote:
> > On Tuesday 19 January 2016 13:37:50 James Hogan wrote:
> > > When a header file is removed from generic-y (often accompanied by the
> > > addition of an arch specific header), the generated wrapper file will
> > > persist, and in some cases may still take precedence over the new arch
> > > header.
> > > 
> > > For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> > > context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> > > and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> > > the wrapper when reusing a dirty build tree resulted in build failures
> > > in arch/mips/kernel/signal.c:
> > > 
> > > arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> > > arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
> > >   return &uc->uc_extcontext;
> > >             ^
> > > 
> > > Fix by detecting and removing wrapper headers in generated header
> > > directories that do not correspond to a filename in generic-y, genhdr-y,
> > > or the newly introduced generated-y.
> > 
> > Good idea.
> > 
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> Thanks Arnd
> 
> > Can you merge this through the mips tree, or do you need me to pick it
> > up through asm-generic?
> 
> I was envisaging the kbuild tree tbh, but I don't really mind how it
> gets merged. This patch depends on patch 1, which adds generated-y to
> x86 so we don't delete their other generated headers, but other than
> that it doesn't really have any dependencies.

Ok, the kbuild tree works fine too, and I guess the x86 tree would
also be fine if that helps avoid the dependency.

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Florian Fainelli Jan. 20, 2016, 6:55 p.m. UTC | #4
Le 19/01/2016 05:37, James Hogan a écrit :
> When a header file is removed from generic-y (often accompanied by the
> addition of an arch specific header), the generated wrapper file will
> persist, and in some cases may still take precedence over the new arch
> header.
> 
> For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> the wrapper when reusing a dirty build tree resulted in build failures
> in arch/mips/kernel/signal.c:
> 
> arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
>   return &uc->uc_extcontext;
>             ^
> 
> Fix by detecting and removing wrapper headers in generated header
> directories that do not correspond to a filename in generic-y, genhdr-y,
> or the newly introduced generated-y.
> 
> Reported-by: Jacek Anaszewski <j.anaszewski@samsung.com>
> Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
> Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Signed-off-by: James Hogan <james.hogan@imgtec.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks for looking into this James.

> Cc: Michal Marek <mmarek@suse.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: linux-kbuild@vger.kernel.org
> Cc: linux-arch@vger.kernel.org
> Cc: linux-mips@linux-mips.org
> ---
> Changes in v2:
> - Rewrite a bit, drawing inspiration from Makefile.headersinst.
> - Exclude genhdr-y and generated-y (thanks to kbuild test robot).
> ---
>  scripts/Makefile.asm-generic | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
> index 045e0098e962..24c29f16f029 100644
> --- a/scripts/Makefile.asm-generic
> +++ b/scripts/Makefile.asm-generic
> @@ -13,11 +13,26 @@ include scripts/Kbuild.include
>  # Create output directory if not already present
>  _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
>  
> +# Stale wrappers when the corresponding files are removed from generic-y
> +# need removing.
> +generated-y   := $(generic-y) $(genhdr-y) $(generated-y)
> +all-files     := $(patsubst %, $(obj)/%, $(generated-y))
> +old-headers   := $(wildcard $(obj)/*.h)
> +unwanted      := $(filter-out $(all-files),$(old-headers))
> +
>  quiet_cmd_wrap = WRAP    $@
>  cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
>  
> -all: $(patsubst %, $(obj)/%, $(generic-y))
> +quiet_cmd_remove = REMOVE  $(unwanted)
> +cmd_remove = rm -f $(unwanted)
> +
> +all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE
> +	$(if $(unwanted),$(call cmd,remove),)
>  	@:
>  
>  $(obj)/%.h:
>  	$(call cmd,wrap)
> +
> +.PHONY: $(PHONY)
> +PHONY += FORCE
> +FORCE: ;
>
Paul Burton Jan. 21, 2016, 12:03 a.m. UTC | #5
On Tue, Jan 19, 2016 at 01:37:50PM +0000, James Hogan wrote:
> When a header file is removed from generic-y (often accompanied by the
> addition of an arch specific header), the generated wrapper file will
> persist, and in some cases may still take precedence over the new arch
> header.
> 
> For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> the wrapper when reusing a dirty build tree resulted in build failures
> in arch/mips/kernel/signal.c:
> 
> arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
>   return &uc->uc_extcontext;
>             ^
> 
> Fix by detecting and removing wrapper headers in generated header
> directories that do not correspond to a filename in generic-y, genhdr-y,
> or the newly introduced generated-y.
> 
> Reported-by: Jacek Anaszewski <j.anaszewski@samsung.com>
> Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
> Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Signed-off-by: James Hogan <james.hogan@imgtec.com>
> Cc: Michal Marek <mmarek@suse.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: linux-kbuild@vger.kernel.org
> Cc: linux-arch@vger.kernel.org
> Cc: linux-mips@linux-mips.org
> ---
> Changes in v2:
> - Rewrite a bit, drawing inspiration from Makefile.headersinst.
> - Exclude genhdr-y and generated-y (thanks to kbuild test robot).
> ---
>  scripts/Makefile.asm-generic | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
> index 045e0098e962..24c29f16f029 100644
> --- a/scripts/Makefile.asm-generic
> +++ b/scripts/Makefile.asm-generic
> @@ -13,11 +13,26 @@ include scripts/Kbuild.include
>  # Create output directory if not already present
>  _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
>  
> +# Stale wrappers when the corresponding files are removed from generic-y
> +# need removing.
> +generated-y   := $(generic-y) $(genhdr-y) $(generated-y)
> +all-files     := $(patsubst %, $(obj)/%, $(generated-y))
> +old-headers   := $(wildcard $(obj)/*.h)
> +unwanted      := $(filter-out $(all-files),$(old-headers))

Hi James,

Thanks a bunch for fixing this!

Though is it my sleepy self or are all-files & old-headers misnomers?
That is, isn't all-files actually a list of headers to be kept, and
old-headers actually the list of all (header) files?

Thanks,
    Paul

> +
>  quiet_cmd_wrap = WRAP    $@
>  cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
>  
> -all: $(patsubst %, $(obj)/%, $(generic-y))
> +quiet_cmd_remove = REMOVE  $(unwanted)
> +cmd_remove = rm -f $(unwanted)
> +
> +all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE
> +	$(if $(unwanted),$(call cmd,remove),)
>  	@:
>  
>  $(obj)/%.h:
>  	$(call cmd,wrap)
> +
> +.PHONY: $(PHONY)
> +PHONY += FORCE
> +FORCE: ;
> -- 
> 2.4.10
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
James Hogan Jan. 21, 2016, 10:19 a.m. UTC | #6
On Thu, Jan 21, 2016 at 12:03:42AM +0000, Paul Burton wrote:
> On Tue, Jan 19, 2016 at 01:37:50PM +0000, James Hogan wrote:
> > When a header file is removed from generic-y (often accompanied by the
> > addition of an arch specific header), the generated wrapper file will
> > persist, and in some cases may still take precedence over the new arch
> > header.
> > 
> > For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> > context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> > and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> > the wrapper when reusing a dirty build tree resulted in build failures
> > in arch/mips/kernel/signal.c:
> > 
> > arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> > arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
> >   return &uc->uc_extcontext;
> >             ^
> > 
> > Fix by detecting and removing wrapper headers in generated header
> > directories that do not correspond to a filename in generic-y, genhdr-y,
> > or the newly introduced generated-y.
> > 
> > Reported-by: Jacek Anaszewski <j.anaszewski@samsung.com>
> > Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
> > Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> > Signed-off-by: James Hogan <james.hogan@imgtec.com>
> > Cc: Michal Marek <mmarek@suse.com>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Ralf Baechle <ralf@linux-mips.org>
> > Cc: Paul Burton <paul.burton@imgtec.com>
> > Cc: Florian Fainelli <f.fainelli@gmail.com>
> > Cc: linux-kbuild@vger.kernel.org
> > Cc: linux-arch@vger.kernel.org
> > Cc: linux-mips@linux-mips.org
> > ---
> > Changes in v2:
> > - Rewrite a bit, drawing inspiration from Makefile.headersinst.
> > - Exclude genhdr-y and generated-y (thanks to kbuild test robot).
> > ---
> >  scripts/Makefile.asm-generic | 17 ++++++++++++++++-
> >  1 file changed, 16 insertions(+), 1 deletion(-)
> > 
> > diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
> > index 045e0098e962..24c29f16f029 100644
> > --- a/scripts/Makefile.asm-generic
> > +++ b/scripts/Makefile.asm-generic
> > @@ -13,11 +13,26 @@ include scripts/Kbuild.include
> >  # Create output directory if not already present
> >  _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
> >  
> > +# Stale wrappers when the corresponding files are removed from generic-y
> > +# need removing.
> > +generated-y   := $(generic-y) $(genhdr-y) $(generated-y)
> > +all-files     := $(patsubst %, $(obj)/%, $(generated-y))
> > +old-headers   := $(wildcard $(obj)/*.h)
> > +unwanted      := $(filter-out $(all-files),$(old-headers))
> 
> Hi James,
> 
> Thanks a bunch for fixing this!

FTR, I noticed yesterday it fixes a similar case when switching v4.3 to
v4.4 too:

arch/mips/kernel/../../../fs/binfmt_elf.c In function ‘create_elf_tables’:
./arch/mips/include/asm/elf.h +425 :14: error: ‘AT_SYSINFO_EHDR’ undeclared (first use in this function)
  NEW_AUX_ENT(AT_SYSINFO_EHDR,     \
              ^

Due to commit ebb5e78cc634 ("MIPS: Initial implementation of a VDSO")
adding uapi/asm/auxvec.h and changing generic-y to header-y. Should
ucontext.h be exported via header-y too?

With these patches, it removes the stale file:
  REMOVE  arch/mips/include/generated/uapi/asm/auxvec.h

> 
> Though is it my sleepy self or are all-files & old-headers misnomers?
> That is, isn't all-files actually a list of headers to be kept, and
> old-headers actually the list of all (header) files?

I've followed the naming in Makefile.headersinst. I read all-files as
"all the files we care about" (i.e. its a combination of several sets of
generated files, hence "all") and old-headers as in "existing headers"
(since it won't include files which haven't been generated yet).

all-files could perhaps be renamed new-headers, but that could be
misleading too.

Cheers
James

> 
> Thanks,
>     Paul
> 
> > +
> >  quiet_cmd_wrap = WRAP    $@
> >  cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
> >  
> > -all: $(patsubst %, $(obj)/%, $(generic-y))
> > +quiet_cmd_remove = REMOVE  $(unwanted)
> > +cmd_remove = rm -f $(unwanted)
> > +
> > +all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE
> > +	$(if $(unwanted),$(call cmd,remove),)
> >  	@:
> >  
> >  $(obj)/%.h:
> >  	$(call cmd,wrap)
> > +
> > +.PHONY: $(PHONY)
> > +PHONY += FORCE
> > +FORCE: ;
> > -- 
> > 2.4.10
> >
James Hogan Feb. 23, 2016, 9:51 a.m. UTC | #7
Hi Michal,

On Tue, Jan 19, 2016 at 03:27:24PM +0100, Arnd Bergmann wrote:
> On Tuesday 19 January 2016 14:22:13 James Hogan wrote:
> > On Tue, Jan 19, 2016 at 03:09:14PM +0100, Arnd Bergmann wrote:
> > > On Tuesday 19 January 2016 13:37:50 James Hogan wrote:
> > > > When a header file is removed from generic-y (often accompanied by the
> > > > addition of an arch specific header), the generated wrapper file will
> > > > persist, and in some cases may still take precedence over the new arch
> > > > header.
> > > > 
> > > > For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> > > > context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> > > > and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> > > > the wrapper when reusing a dirty build tree resulted in build failures
> > > > in arch/mips/kernel/signal.c:
> > > > 
> > > > arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> > > > arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
> > > >   return &uc->uc_extcontext;
> > > >             ^
> > > > 
> > > > Fix by detecting and removing wrapper headers in generated header
> > > > directories that do not correspond to a filename in generic-y, genhdr-y,
> > > > or the newly introduced generated-y.
> > > 
> > > Good idea.
> > > 
> > > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > 
> > Thanks Arnd
> > 
> > > Can you merge this through the mips tree, or do you need me to pick it
> > > up through asm-generic?
> > 
> > I was envisaging the kbuild tree tbh, but I don't really mind how it
> > gets merged. This patch depends on patch 1, which adds generated-y to
> > x86 so we don't delete their other generated headers, but other than
> > that it doesn't really have any dependencies.
> 
> Ok, the kbuild tree works fine too, and I guess the x86 tree would
> also be fine if that helps avoid the dependency.

Were you okay to take these patches, or would you prefer they go via the
MIPS tree?

Thanks
James
James Hogan April 21, 2016, 6:44 p.m. UTC | #8
On Tue, Feb 23, 2016 at 09:51:07AM +0000, James Hogan wrote:
> Hi Michal,
> 
> On Tue, Jan 19, 2016 at 03:27:24PM +0100, Arnd Bergmann wrote:
> > On Tuesday 19 January 2016 14:22:13 James Hogan wrote:
> > > On Tue, Jan 19, 2016 at 03:09:14PM +0100, Arnd Bergmann wrote:
> > > > On Tuesday 19 January 2016 13:37:50 James Hogan wrote:
> > > > > When a header file is removed from generic-y (often accompanied by the
> > > > > addition of an arch specific header), the generated wrapper file will
> > > > > persist, and in some cases may still take precedence over the new arch
> > > > > header.
> > > > > 
> > > > > For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended
> > > > > context") removed ucontext.h from generic-y in arch/mips/include/asm/,
> > > > > and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of
> > > > > the wrapper when reusing a dirty build tree resulted in build failures
> > > > > in arch/mips/kernel/signal.c:
> > > > > 
> > > > > arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’:
> > > > > arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’
> > > > >   return &uc->uc_extcontext;
> > > > >             ^
> > > > > 
> > > > > Fix by detecting and removing wrapper headers in generated header
> > > > > directories that do not correspond to a filename in generic-y, genhdr-y,
> > > > > or the newly introduced generated-y.
> > > > 
> > > > Good idea.
> > > > 
> > > > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > > 
> > > Thanks Arnd
> > > 
> > > > Can you merge this through the mips tree, or do you need me to pick it
> > > > up through asm-generic?
> > > 
> > > I was envisaging the kbuild tree tbh, but I don't really mind how it
> > > gets merged. This patch depends on patch 1, which adds generated-y to
> > > x86 so we don't delete their other generated headers, but other than
> > > that it doesn't really have any dependencies.
> > 
> > Ok, the kbuild tree works fine too, and I guess the x86 tree would
> > also be fine if that helps avoid the dependency.
> 
> Were you okay to take these patches, or would you prefer they go via the
> MIPS tree?

I'm keen for these two patches to make their way upstream one way or
another.

Ralf: Since it affects MIPS, would you be able to take them?

Cheers
James

Patch
diff mbox

diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index 045e0098e962..24c29f16f029 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -13,11 +13,26 @@  include scripts/Kbuild.include
 # Create output directory if not already present
 _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
 
+# Stale wrappers when the corresponding files are removed from generic-y
+# need removing.
+generated-y   := $(generic-y) $(genhdr-y) $(generated-y)
+all-files     := $(patsubst %, $(obj)/%, $(generated-y))
+old-headers   := $(wildcard $(obj)/*.h)
+unwanted      := $(filter-out $(all-files),$(old-headers))
+
 quiet_cmd_wrap = WRAP    $@
 cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
 
-all: $(patsubst %, $(obj)/%, $(generic-y))
+quiet_cmd_remove = REMOVE  $(unwanted)
+cmd_remove = rm -f $(unwanted)
+
+all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE
+	$(if $(unwanted),$(call cmd,remove),)
 	@:
 
 $(obj)/%.h:
 	$(call cmd,wrap)
+
+.PHONY: $(PHONY)
+PHONY += FORCE
+FORCE: ;