| Message ID | 20210223181425.4010665-3-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Build time gitignore checking | expand |
On Wed, Feb 24, 2021 at 3:14 AM Rob Herring <robh@kernel.org> wrote: > > Including the generated syscall headers in 'targets' is wrong because they > are not built in $(obj)/ and the Makefile does its own path prefix and > build rules. > > Cc: Andy Lutomirski <luto@kernel.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Borislav Petkov <bp@alien8.de> > Cc: x86@kernel.org > Cc: "H. Peter Anvin" <hpa@zytor.com> > Cc: Masahiro Yamada <masahiroy@kernel.org> > Cc: Michal Marek <michal.lkml@markovi.net> > Signed-off-by: Rob Herring <robh@kernel.org> > --- > arch/x86/entry/syscalls/Makefile | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/x86/entry/syscalls/Makefile b/arch/x86/entry/syscalls/Makefile > index 6fb9b57ed5ba..b0dcb7e41554 100644 > --- a/arch/x86/entry/syscalls/Makefile > +++ b/arch/x86/entry/syscalls/Makefile > @@ -62,8 +62,6 @@ syshdr-$(CONFIG_X86_64) += unistd_32_ia32.h unistd_64_x32.h > syshdr-$(CONFIG_X86_64) += syscalls_64.h > syshdr-$(CONFIG_XEN) += xen-hypercalls.h > > -targets += $(uapisyshdr-y) $(syshdr-y) > - This is also a wrong fix. The correct fix exists in linux-next. commit 865fa29f7dd1b6af8498fe08f19b4028c1c8a153 Author: Masahiro Yamada <masahiroy@kernel.org> Date: Mon Feb 15 09:48:22 2021 +0900 arch: syscalls: add missing FORCE and fix 'targets' to make if_changed work I will send a PR this week. > PHONY += all > all: $(addprefix $(uapi)/,$(uapisyshdr-y)) > all: $(addprefix $(out)/,$(syshdr-y)) > -- > 2.27.0 >
diff --git a/arch/x86/entry/syscalls/Makefile b/arch/x86/entry/syscalls/Makefile index 6fb9b57ed5ba..b0dcb7e41554 100644 --- a/arch/x86/entry/syscalls/Makefile +++ b/arch/x86/entry/syscalls/Makefile @@ -62,8 +62,6 @@ syshdr-$(CONFIG_X86_64) += unistd_32_ia32.h unistd_64_x32.h syshdr-$(CONFIG_X86_64) += syscalls_64.h syshdr-$(CONFIG_XEN) += xen-hypercalls.h -targets += $(uapisyshdr-y) $(syshdr-y) - PHONY += all all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(addprefix $(out)/,$(syshdr-y))
Including the generated syscall headers in 'targets' is wrong because they are not built in $(obj)/ and the Makefile does its own path prefix and build rules. Cc: Andy Lutomirski <luto@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Michal Marek <michal.lkml@markovi.net> Signed-off-by: Rob Herring <robh@kernel.org> --- arch/x86/entry/syscalls/Makefile | 2 -- 1 file changed, 2 deletions(-)