| Message ID | 20220527100155.1996314-2-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | kbuild: yet another series of cleanups | expand |
On Fri, May 27, 2022 at 07:01:48PM +0900, Masahiro Yamada wrote: > *.prelink.o is created when CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT > is enabled. > > Replace $(linked-object) with $(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT) > so you will get better idea when the --link option is passed. > > No functional change is intended. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
On Fri, May 27, 2022 at 3:04 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > *.prelink.o is created when CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT > is enabled. > > Replace $(linked-object) with $(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT) > so you will get better idea when the --link option is passed. > > No functional change is intended. It triggered my PTSD to see this ^ expression; many commits to LLVM are labeled "NFCI." Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > Changes in v7: > - New patch > > scripts/Makefile.build | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 06400504150b..f80196eef03a 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -219,7 +219,7 @@ objtool_args = \ > $(if $(CONFIG_STACK_VALIDATION), --stackval) \ > $(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \ > --uaccess \ > - $(if $(linked-object), --link) \ > + $(if $($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)), --link) \ > $(if $(part-of-module), --module) \ > $(if $(CONFIG_GCOV_KERNEL), --no-unreachable) > > @@ -284,7 +284,6 @@ quiet_cmd_cc_prelink_modules = LD [M] $@ > # modules into native code > $(obj)/%.prelink.o: objtool-enabled = y > $(obj)/%.prelink.o: part-of-module := y > -$(obj)/%.prelink.o: linked-object := y > > $(obj)/%.prelink.o: $(obj)/%.o FORCE > $(call if_changed,cc_prelink_modules) > -- > 2.32.0 >
On Fri, May 27, 2022 at 1:56 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > *.prelink.o is created when CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT > is enabled. > > Replace $(linked-object) with $(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT) > so you will get better idea when the --link option is passed. > > No functional change is intended. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Hi Masahiroy, I was not CCed on the cover-letter and only on some patches in this series. So, I have re-tested this series by pulling from kbuild.git#kbuild (saw later you renewed the parisc/nm patch). While testing my selfmade LLVM version 14.0.4 (PGO + ThinLTO optimized) toolchain I included this series. Just built fine and I was able to boot on bare metal. -Sedat - > --- > > Changes in v7: > - New patch > > scripts/Makefile.build | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 06400504150b..f80196eef03a 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -219,7 +219,7 @@ objtool_args = \ > $(if $(CONFIG_STACK_VALIDATION), --stackval) \ > $(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \ > --uaccess \ > - $(if $(linked-object), --link) \ > + $(if $($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)), --link) \ > $(if $(part-of-module), --module) \ > $(if $(CONFIG_GCOV_KERNEL), --no-unreachable) > > @@ -284,7 +284,6 @@ quiet_cmd_cc_prelink_modules = LD [M] $@ > # modules into native code > $(obj)/%.prelink.o: objtool-enabled = y > $(obj)/%.prelink.o: part-of-module := y > -$(obj)/%.prelink.o: linked-object := y > > $(obj)/%.prelink.o: $(obj)/%.o FORCE > $(call if_changed,cc_prelink_modules) > -- > 2.32.0 >
On Sat, May 28, 2022 at 11:32 AM Sedat Dilek <sedat.dilek@gmail.com> wrote: > > On Fri, May 27, 2022 at 1:56 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > > > *.prelink.o is created when CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT > > is enabled. > > > > Replace $(linked-object) with $(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT) > > so you will get better idea when the --link option is passed. > > > > No functional change is intended. > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > Hi Masahiroy, > > I was not CCed on the cover-letter and only on some patches in this series. > > So, I have re-tested this series by pulling from kbuild.git#kbuild > (saw later you renewed the parisc/nm patch). > > While testing my selfmade LLVM version 14.0.4 (PGO + ThinLTO > optimized) toolchain I included this series. > > Just built fine and I was able to boot on bare metal. > > -Sedat - > Thanks for your testing! I added your Tested-by tag. > > --- > > > > Changes in v7: > > - New patch > > > > scripts/Makefile.build | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > > index 06400504150b..f80196eef03a 100644 > > --- a/scripts/Makefile.build > > +++ b/scripts/Makefile.build > > @@ -219,7 +219,7 @@ objtool_args = \ > > $(if $(CONFIG_STACK_VALIDATION), --stackval) \ > > $(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \ > > --uaccess \ > > - $(if $(linked-object), --link) \ > > + $(if $($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)), --link) \ > > $(if $(part-of-module), --module) \ > > $(if $(CONFIG_GCOV_KERNEL), --no-unreachable) > > > > @@ -284,7 +284,6 @@ quiet_cmd_cc_prelink_modules = LD [M] $@ > > # modules into native code > > $(obj)/%.prelink.o: objtool-enabled = y > > $(obj)/%.prelink.o: part-of-module := y > > -$(obj)/%.prelink.o: linked-object := y > > > > $(obj)/%.prelink.o: $(obj)/%.o FORCE > > $(call if_changed,cc_prelink_modules) > > -- > > 2.32.0 > >
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 06400504150b..f80196eef03a 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -219,7 +219,7 @@ objtool_args = \ $(if $(CONFIG_STACK_VALIDATION), --stackval) \ $(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \ --uaccess \ - $(if $(linked-object), --link) \ + $(if $($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)), --link) \ $(if $(part-of-module), --module) \ $(if $(CONFIG_GCOV_KERNEL), --no-unreachable) @@ -284,7 +284,6 @@ quiet_cmd_cc_prelink_modules = LD [M] $@ # modules into native code $(obj)/%.prelink.o: objtool-enabled = y $(obj)/%.prelink.o: part-of-module := y -$(obj)/%.prelink.o: linked-object := y $(obj)/%.prelink.o: $(obj)/%.o FORCE $(call if_changed,cc_prelink_modules)
*.prelink.o is created when CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT is enabled. Replace $(linked-object) with $(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT) so you will get better idea when the --link option is passed. No functional change is intended. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- Changes in v7: - New patch scripts/Makefile.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)