Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm/Makefile
between commit:
596b0474d3d9 ("kbuild: preprocess module linker script")
from the kbuild tree and commit:
5a17850e251a ("arm/build: Warn on orphan section placement")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/Makefile
index e15f76ca2887,e589da3c8949..000000000000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -16,6 -16,14 +16,10 @@@ LDFLAGS_vmlinux += --be
KBUILD_LDFLAGS_MODULE += --be8
endif
+ # We never want expected sections to be placed heuristically by the
+ # linker. All sections should be explicitly named in the linker script.
+ LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn)
+
-ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
-KBUILD_LDS_MODULE += $(srctree)/arch/arm/kernel/module.lds
-endif
-
GZFLAGS :=-9
#KBUILD_CFLAGS +=-pipe
Hi all,
On Fri, 25 Sep 2020 15:25:45 +1000 Stephen Rothwell <[email protected]> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm/Makefile
>
> between commit:
>
> 596b0474d3d9 ("kbuild: preprocess module linker script")
>
> from the kbuild tree and commit:
>
> 5a17850e251a ("arm/build: Warn on orphan section placement")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc arch/arm/Makefile
> index e15f76ca2887,e589da3c8949..000000000000
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@@ -16,6 -16,14 +16,10 @@@ LDFLAGS_vmlinux += --be
> KBUILD_LDFLAGS_MODULE += --be8
> endif
>
> + # We never want expected sections to be placed heuristically by the
> + # linker. All sections should be explicitly named in the linker script.
> + LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn)
> +
> -ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
> -KBUILD_LDS_MODULE += $(srctree)/arch/arm/kernel/module.lds
> -endif
> -
> GZFLAGS :=-9
> #KBUILD_CFLAGS +=-pipe
>
This is now a conflict between the kbuild tree and Linus' tree.
--
Cheers,
Stephen Rothwell
On Mon, May 23, 2022 at 1:24 PM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> scripts/Makefile.build
>
> between commit:
>
> 0212301af7bb ("kbuild: do not create *.prelink.o for Clang LTO or IBT")
>
> from the kbuild tree and commit:
>
> 753da4179d08 ("objtool: Remove --lto and --vmlinux in favor of --link")
>
> from the tip tree.
>
> I am not sure if I fixed this up correctly, please check the final result
> when linux-next is released.
>
> I fixed it up (I used the former version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
I think you can fix up around line 420
of scripts/Makefile.build
$(multi-obj-m): objtool-enabled := $(delay-objtool)
$(multi-obj-m): part-of-module := y
$(multi-obj-m): linked-object := y <--- Add this
$(multi-obj-m): %.o: %.mod FORCE
$(call if_changed_rule,ld_multi_m)
--
Best Regards
Masahiro Yamada
Hi Masahiro,
On Mon, 23 May 2022 14:37:28 +0900 Masahiro Yamada <[email protected]> wrote:
>
> On Mon, May 23, 2022 at 1:24 PM Stephen Rothwell <[email protected]> wrote:
> >
> > I am not sure if I fixed this up correctly, please check the final result
> > when linux-next is released.
>
> I think you can fix up around line 420
> of scripts/Makefile.build
>
>
> $(multi-obj-m): objtool-enabled := $(delay-objtool)
> $(multi-obj-m): part-of-module := y
> $(multi-obj-m): linked-object := y <--- Add this
> $(multi-obj-m): %.o: %.mod FORCE
> $(call if_changed_rule,ld_multi_m)
Yeah, I tried that, but it needed more - see my upcoming reply to
myself ... (which is probably overkill, but gets rid of lots of
warnings).
--
Cheers,
Stephen Rothwell