merged. Bruce
In message: [linux-yocto][linux-yocto v5.4/standard/nxp-imx8][PATCH 1/2] arm64: link with -z norelro for LLD or aarch64-elf on 25/01/2021 Jun Miao wrote: > From: Nick Desaulniers <[email protected]> > > commit 311bea3cb9ee20ef150ca76fc60a592bf6b159f5 upstream > > With GNU binutils 2.35+, linking with BFD produces warnings for vmlinux: > aarch64-linux-gnu-ld: warning: -z norelro ignored > > BFD can produce this warning when the target emulation mode does not > support RELRO program headers, and -z relro or -z norelro is passed. > > Alan Modra clarifies: > The default linker emulation for an aarch64-linux ld.bfd is > -maarch64linux, the default for an aarch64-elf linker is > -maarch64elf. They are not equivalent. If you choose -maarch64elf > you get an emulation that doesn't support -z relro. > > The ARCH=arm64 kernel prefers -maarch64elf, but may fall back to > -maarch64linux based on the toolchain configuration. > > LLD will always create RELRO program header regardless of target > emulation. > > To avoid the above warning when linking with BFD, pass -z norelro only > when linking with LLD or with -maarch64linux. > > Fixes: 3b92fa7485eb ("arm64: link with -z norelro regardless of > CONFIG_RELOCATABLE") > Fixes: 3bbd3db86470 ("arm64: relocatable: fix inconsistencies in linker > script and options") > Cc: <[email protected]> # 5.0.x- > Reported-by: kernelci.org bot <[email protected]> > Reported-by: Quentin Perret <[email protected]> > Signed-off-by: Nick Desaulniers <[email protected]> > Reviewed-by: Nathan Chancellor <[email protected]> > Acked-by: Ard Biesheuvel <[email protected]> > Cc: Alan Modra <[email protected]> > Cc: Fāng-ruì Sòng <[email protected]> > Link: > https://lore.kernel.org/r/[email protected] > Signed-off-by: Catalin Marinas <[email protected]> > Signed-off-by: Jun Miao <[email protected]> > --- > arch/arm64/Makefile | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > index cd8f3cdabfd0..d227cf87c48f 100644 > --- a/arch/arm64/Makefile > +++ b/arch/arm64/Makefile > @@ -10,7 +10,7 @@ > # > # Copyright (C) 1995-2001 by Russell King > > -LDFLAGS_vmlinux :=--no-undefined -X -z norelro > +LDFLAGS_vmlinux :=--no-undefined -X > CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) > GZFLAGS :=-9 > > @@ -82,17 +82,21 @@ CHECKFLAGS += -D__AARCH64EB__ > AS += -EB > # Prefer the baremetal ELF build target, but not all toolchains include > # it so fall back to the standard linux version if needed. > -KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb) > +KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb > -z norelro) > UTS_MACHINE := aarch64_be > else > KBUILD_CPPFLAGS += -mlittle-endian > CHECKFLAGS += -D__AARCH64EL__ > AS += -EL > # Same as above, prefer ELF but fall back to linux target if needed. > -KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux) > +KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux > -z norelro) > UTS_MACHINE := aarch64 > endif > > +ifeq ($(CONFIG_LD_IS_LLD), y) > +KBUILD_LDFLAGS += -z norelro > +endif > + > CHECKFLAGS += -D__aarch64__ > > ifeq ($(CONFIG_ARM64_MODULE_PLTS),y) > -- > 2.25.1 > In message: [linux-yocto][linux-yocto v5.4/standard/nxp-imx8] [PATCH 2/2] drm: mhdp: fix warning when compiling cdns-mhdp.h on 25/01/2021 Jun Miao wrote: > > include/drm/bridge/cdns-mhdp.h:635:21: warning: 'struct platform_device' > declared > inside parameter list will not be visible outside of this definition or > declaration > 635 | int (*bind)(struct platform_device *pdev, > | ^~~~~~~~~~~~~~~ > > Signed-off-by: Jun Miao <[email protected]> > --- > include/drm/bridge/cdns-mhdp.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/drm/bridge/cdns-mhdp.h b/include/drm/bridge/cdns-mhdp.h > index 1f8fd024cdfa..4d4ba1ac6281 100755 > --- a/include/drm/bridge/cdns-mhdp.h > +++ b/include/drm/bridge/cdns-mhdp.h > @@ -16,6 +16,7 @@ > #ifndef CDNS_MHDP_H_ > #define CDNS_MHDP_H_ > > +#include <linux/platform_device.h> > #include <drm/drm_bridge.h> > #include <drm/drm_connector.h> > #include <drm/drm_dp_helper.h> > -- > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9432): https://lists.yoctoproject.org/g/linux-yocto/message/9432 Mute This Topic: https://lists.yoctoproject.org/mt/80131621/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
