[PATCH] kbuild: Remove stale asm-generic wrappers

From: James Hogan
Date: Tue Jan 19 2016 - 05:32:24 EST

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

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 wrapper headers in generated header directories that do
not correspond to a filename in generic-y, and removing them.

Reported-by: Jacek Anaszewski <j.anaszewski@xxxxxxxxxxx>
Reported-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Reported-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Paul Burton <paul.burton@xxxxxxxxxx>
Cc: Florian Fainelli <f.fainelli@xxxxxxxxx>
Cc: linux-kbuild@xxxxxxxxxxxxxxx
Cc: linux-arch@xxxxxxxxxxxxxxx
Cc: linux-mips@xxxxxxxxxxxxxx
scripts/Makefile.asm-generic | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index 045e0098e962..7422f6476a8a 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -21,3 +21,19 @@ all: $(patsubst %, $(obj)/%, $(generic-y))

$(call cmd,wrap)
+# Remove stale wrappers when the corresponding files are removed from
+# generic-y
+quiet_cmd_rmwrap = REMOVE $(patsubst %.rm,%,$@)
+cmd_rmwrap = rm -f $(patsubst %.rm, %, $@)
+all: $(filter-out $(patsubst %, $(obj)/%.rm, $(generic-y)), \
+ $(patsubst %, %.rm, $(wildcard $(obj)/*.h)))
+$(obj)/%.h.rm: FORCE
+ $(call cmd,rmwrap)