| Message ID | 20240126-4-19-fix-lib-powerpc-backport-v1-1-f0de224db66b@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [4.19] powerpc: Use always instead of always-y in for crtsavres.o | expand |
On Fri, Jan 26, 2024 at 10:36:31AM -0700, Nathan Chancellor wrote: > This commit is for linux-4.19.y only, it has no direct upstream > equivalent. > > Prior to commit 5f2fb52fac15 ("kbuild: rename hostprogs-y/always to > hostprogs/always-y"), always-y did not exist, making the backport of > mainline commit 1b1e38002648 ("powerpc: add crtsavres.o to always-y > instead of extra-y") to linux-4.19.y as commit b7b85ec5ec15 ("powerpc: > add crtsavres.o to always-y instead of extra-y") incorrect, breaking the > build with linkers that need crtsavres.o: > > ld.lld: error: cannot open arch/powerpc/lib/crtsavres.o: No such file or directory > > Backporting the aforementioned kbuild commit is not suitable for stable > due to its size and number of conflicts, so transform the always-y usage > to an equivalent form using always, which resolves the build issues. > > Fixes: b7b85ec5ec15 ("powerpc: add crtsavres.o to always-y instead of extra-y") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > --- Both now queued up, thanks! greg k-h
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 6f1e57182876..f0aa6fc8c6b2 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -21,8 +21,8 @@ obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o strlen_32.o # 64-bit linker creates .sfpr on demand for final link (vmlinux), # so it is only needed for modules, and only for older linkers which # do not support --save-restore-funcs -ifeq ($(call ld-ifversion, -lt, 225000000, y),y) -always-$(CONFIG_PPC64) += crtsavres.o +ifeq ($(call ld-ifversion, -lt, 225000000, y)$(CONFIG_PPC64),yy) +always += crtsavres.o endif obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
This commit is for linux-4.19.y only, it has no direct upstream equivalent. Prior to commit 5f2fb52fac15 ("kbuild: rename hostprogs-y/always to hostprogs/always-y"), always-y did not exist, making the backport of mainline commit 1b1e38002648 ("powerpc: add crtsavres.o to always-y instead of extra-y") to linux-4.19.y as commit b7b85ec5ec15 ("powerpc: add crtsavres.o to always-y instead of extra-y") incorrect, breaking the build with linkers that need crtsavres.o: ld.lld: error: cannot open arch/powerpc/lib/crtsavres.o: No such file or directory Backporting the aforementioned kbuild commit is not suitable for stable due to its size and number of conflicts, so transform the always-y usage to an equivalent form using always, which resolves the build issues. Fixes: b7b85ec5ec15 ("powerpc: add crtsavres.o to always-y instead of extra-y") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- arch/powerpc/lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: b060cfd3f707ad3c8ae8322e1b149ba7e2cf33e0 change-id: 20240126-4-19-fix-lib-powerpc-backport-6f4a823adf1a Best regards,