From: James Hogan <james.hogan@imgtec.com> To: Michal Marek <mmarek@suse.com> Cc: <linux-kernel@vger.kernel.org>, Heinrich Schuchardt <xypron.glpk@gmx.de>, James Hogan <james.hogan@imgtec.com>, Arnd Bergmann <arnd@arndb.de>, "Ralf Baechle" <ralf@linux-mips.org>, Paul Burton <paul.burton@imgtec.com>, Florian Fainelli <f.fainelli@gmail.com>, <linux-kbuild@vger.kernel.org>, <linux-arch@vger.kernel.org>, <linux-mips@linux-mips.org> Subject: [PATCH] kbuild: Remove stale asm-generic wrappers Date: Tue, 19 Jan 2016 10:31:43 +0000 [thread overview] Message-ID: <1453199503-30900-1-git-send-email-james.hogan@imgtec.com> (raw) In-Reply-To: <20160119100154.GJ30608@jhogan-linux.le.imgtec.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. 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@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 --- 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)) $(obj)/%.h: $(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) + +.PHONY: $(PHONY) +PHONY += FORCE +FORCE: ; -- 2.4.10
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com> To: Michal Marek <mmarek@suse.com> Cc: linux-kernel@vger.kernel.org, Heinrich Schuchardt <xypron.glpk@gmx.de>, James Hogan <james.hogan@imgtec.com>, Arnd Bergmann <arnd@arndb.de>, Ralf Baechle <ralf@linux-mips.org>, Paul Burton <paul.burton@imgtec.com>, Florian Fainelli <f.fainelli@gmail.com>, linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org, linux-mips@linux-mips.org Subject: [PATCH] kbuild: Remove stale asm-generic wrappers Date: Tue, 19 Jan 2016 10:31:43 +0000 [thread overview] Message-ID: <1453199503-30900-1-git-send-email-james.hogan@imgtec.com> (raw) In-Reply-To: <20160119100154.GJ30608@jhogan-linux.le.imgtec.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. 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@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 --- 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)) $(obj)/%.h: $(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) + +.PHONY: $(PHONY) +PHONY += FORCE +FORCE: ; -- 2.4.10
next prev parent reply other threads:[~2016-01-19 10:32 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-17 13:54 cannot build Linux 4.4: arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’ Heinrich Schuchardt 2016-01-17 14:48 ` Heinrich Schuchardt 2016-01-19 2:22 ` Florian Fainelli 2016-01-19 9:06 ` Ralf Baechle 2016-01-19 10:01 ` James Hogan 2016-01-19 10:01 ` James Hogan 2016-01-19 10:31 ` James Hogan [this message] 2016-01-19 10:31 ` [PATCH] kbuild: Remove stale asm-generic wrappers James Hogan 2016-01-19 10:42 ` kbuild test robot 2016-01-19 10:42 ` kbuild test robot 2016-01-19 10:42 ` kbuild test robot 2016-01-19 11:04 ` kbuild test robot 2016-01-19 11:04 ` kbuild test robot 2016-01-19 11:04 ` kbuild test robot 2016-01-19 11:20 ` kbuild test robot 2016-01-19 11:20 ` kbuild test robot 2016-01-19 11:20 ` kbuild test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1453199503-30900-1-git-send-email-james.hogan@imgtec.com \ --to=james.hogan@imgtec.com \ --cc=arnd@arndb.de \ --cc=f.fainelli@gmail.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=mmarek@suse.com \ --cc=paul.burton@imgtec.com \ --cc=ralf@linux-mips.org \ --cc=xypron.glpk@gmx.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.