2022-03-31 14:04:52

by Masahiro Yamada

Subject: [PATCH] ARM: decompressor: fix unneeded rebuilds of library objects

Since commit 251cc826be7d ("ARM: 9154/1: decompressor: do not copy source
files while building"), the following three are rebuilt every time.

AS arch/arm/boot/compressed/lib1funcs.o
AS arch/arm/boot/compressed/ashldi3.o
AS arch/arm/boot/compressed/bswapsdi2.o

Move the "OBJS += ..." line up so these objects are added to 'targets'.

Fixes: 251cc826be7d ("ARM: 9154/1: decompressor: do not copy source files while building")
Reported-by: Russell King (Oracle) <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
---

KernelVersion: v5.17

arch/arm/boot/compressed/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 954eee8a785a..e65c7ad5dd4c 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -97,6 +97,8 @@ endif
$(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \
$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))

+OBJS += lib1funcs.o ashldi3.o bswapsdi2.o
+
targets := vmlinux vmlinux.lds piggy_data piggy.o \
head.o $(OBJS)

@@ -130,8 +132,6 @@ endif
# Next argument is a linker script
LDFLAGS_vmlinux += -T

-OBJS += lib1funcs.o ashldi3.o bswapsdi2.o
-
# We need to prevent any GOTOFF relocs being used with references
# to symbols in the .bss section since we cannot relocate them
# independently from the rest at run time. This can be achieved by
--
2.32.0

2022-04-01 13:49:51

by Nicolas Schier

Subject: Re: [PATCH] ARM: decompressor: fix unneeded rebuilds of library objects

On Thu, Mar 31, 2022 at 05:47:09PM +0900, Masahiro Yamada wrote:
> Since commit 251cc826be7d ("ARM: 9154/1: decompressor: do not copy source
> files while building"), the following three are rebuilt every time.
>
> AS arch/arm/boot/compressed/lib1funcs.o
> AS arch/arm/boot/compressed/ashldi3.o
> AS arch/arm/boot/compressed/bswapsdi2.o
>
> Move the "OBJS += ..." line up so these objects are added to 'targets'.
>
> Fixes: 251cc826be7d ("ARM: 9154/1: decompressor: do not copy source files while building")
> Reported-by: Russell King (Oracle) <[email protected]>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---

Tested-by: Nicolas Schier <[email protected]>