From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Hogan Subject: [PATCH v3 2/2] kbuild: Remove stale asm-generic wrappers Date: Mon, 23 May 2016 09:21:21 +0100 Message-ID: <1463991681-3531-3-git-send-email-james.hogan@imgtec.com> References: <1463991681-3531-1-git-send-email-james.hogan@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1463991681-3531-1-git-send-email-james.hogan@imgtec.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, linux-arch@vger.kernel.org, linux-mips@linux-mips.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , James Hogan , Michal Marek , Arnd Bergmann , Ralf Baechle , Paul Burton , Florian Fainelli , linux-kbuild@vger.kernel.org List-Id: linux-arch.vger.kernel.org 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. =46or 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 o= f 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 =E2=80=98sc_to_extcontext=E2=80=99= : arch/mips/kernel/signal.c:142:12: error: =E2=80=98struct ucontext=E2=80= =99 has no member named =E2=80=98uc_extcontext=E2=80=99 return &uc->uc_extcontext; ^ =46ix 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 Reported-by: Hauke Mehrtens Reported-by: Heinrich Schuchardt Signed-off-by: James Hogan Acked-by: Arnd Bergmann Acked-by: Florian Fainelli Cc: Michal Marek Cc: Arnd Bergmann Cc: Ralf Baechle Cc: Paul Burton Cc: Florian Fainelli Cc: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-mips@linux-mips.org --- Changes in v3: - Ensure FORCE actually gets marked .PHONY. 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-generi= c index 045e0098e962..e4d017d53819 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 :=3D $(shell [ -d $(obj) ] || mkdir -p $(obj)) =20 +# Stale wrappers when the corresponding files are removed from generic= -y +# need removing. +generated-y :=3D $(generic-y) $(genhdr-y) $(generated-y) +all-files :=3D $(patsubst %, $(obj)/%, $(generated-y)) +old-headers :=3D $(wildcard $(obj)/*.h) +unwanted :=3D $(filter-out $(all-files),$(old-headers)) + quiet_cmd_wrap =3D WRAP $@ cmd_wrap =3D echo "\#include " >$@ =20 -all: $(patsubst %, $(obj)/%, $(generic-y)) +quiet_cmd_remove =3D REMOVE $(unwanted) +cmd_remove =3D rm -f $(unwanted) + +all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE + $(if $(unwanted),$(call cmd,remove),) @: =20 $(obj)/%.h: $(call cmd,wrap) + +PHONY +=3D FORCE +.PHONY: $(PHONY) +FORCE: ; --=20 2.4.10 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailapp01.imgtec.com ([195.59.15.196]:40625 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753126AbcEWIVr (ORCPT ); Mon, 23 May 2016 04:21:47 -0400 From: James Hogan Subject: [PATCH v3 2/2] kbuild: Remove stale asm-generic wrappers Date: Mon, 23 May 2016 09:21:21 +0100 Message-ID: <1463991681-3531-3-git-send-email-james.hogan@imgtec.com> In-Reply-To: <1463991681-3531-1-git-send-email-james.hogan@imgtec.com> References: <1463991681-3531-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, linux-arch@vger.kernel.org, linux-mips@linux-mips.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , James Hogan , Michal Marek , Arnd Bergmann , Ralf Baechle , Paul Burton , Florian Fainelli , linux-kbuild@vger.kernel.org Message-ID: <20160523082121.6_9anGMV3UFhiJB4o_hP2qg4aEU1blbaMX-2IYfY__o@z> 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 Reported-by: Hauke Mehrtens Reported-by: Heinrich Schuchardt Signed-off-by: James Hogan Acked-by: Arnd Bergmann Acked-by: Florian Fainelli Cc: Michal Marek Cc: Arnd Bergmann Cc: Ralf Baechle Cc: Paul Burton Cc: Florian Fainelli Cc: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-mips@linux-mips.org --- Changes in v3: - Ensure FORCE actually gets marked .PHONY. 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..e4d017d53819 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 " >$@ -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 += FORCE +.PHONY: $(PHONY) +FORCE: ; -- 2.4.10