Skip to content
Snippets Groups Projects
0035-target-linux-Rebase-broken-patch.patch 1.50 KiB
From 559717a24939cd4da0a60f42c84c63fdc662d12e Mon Sep 17 00:00:00 2001
From: Richard Muzik <richard.muzik@nic.cz>
Date: Fri, 9 Feb 2024 14:36:29 +0100
Subject: [PATCH] target: linux: Rebase broken patch

---
 .../generic/hack-5.15/321-powerpc_crtsavres_prereq.patch | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/target/linux/generic/hack-5.15/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/hack-5.15/321-powerpc_crtsavres_prereq.patch
index f1942e2037..0bf0ba9816 100644
--- a/target/linux/generic/hack-5.15/321-powerpc_crtsavres_prereq.patch
+++ b/target/linux/generic/hack-5.15/321-powerpc_crtsavres_prereq.patch
@@ -16,22 +16,17 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -44,19 +44,6 @@ machine-$(CONFIG_PPC64) += 64
+@@ -44,14 +44,6 @@ machine-$(CONFIG_PPC64) += 64
  machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
  UTS_MACHINE := $(subst $(space),,$(machine-y))
  
--# XXX This needs to be before we override LD below
--ifdef CONFIG_PPC32
--KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
--else
--ifeq ($(call ld-ifversion, -ge, 22500, y),y)
+-ifeq ($(CONFIG_PPC64)$(CONFIG_LD_IS_BFD),yy)
 -# Have the linker provide sfpr if possible.
 -# There is a corresponding test in arch/powerpc/lib/Makefile
 -KBUILD_LDFLAGS_MODULE += --save-restore-funcs
 -else
 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
 -endif
--endif
 -
  ifdef CONFIG_CPU_LITTLE_ENDIAN
  KBUILD_CFLAGS	+= -mlittle-endian
-- 
2.43.0