Commit 251cc826 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Russell King (Oracle)
Browse files

ARM: 9154/1: decompressor: do not copy source files while building 



As commit 7ae4a78d ("ARM: 8969/1: decompressor: simplify libfdt
builds") stated, copying source files during the build time may not
end up with as clean code as expected.

Do similar for the other library files for further cleanups of the
Makefile and .gitignore.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent fa55b7dc

arch/arm/boot/compressed/.gitignore

+0 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

ashldi3.S

bswapsdi2.S

font.c

lib1funcs.S

hyp-stub.S

piggy_data

vmlinux

vmlinux.lds

arch/arm/boot/compressed/Makefile

+3 −30
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y) 
OBJS	+= debug.o

AFLAGS_head.o += -DDEBUG

endif

FONTC	= $(srctree)/lib/fonts/font_acorn_8x8.c



# string library code (-Os is enforced to keep it much smaller)

OBJS		+= string.o
@@ -99,11 +98,8 @@ $(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \ 
	$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))



targets       := vmlinux vmlinux.lds piggy_data piggy.o \

		 lib1funcs.o ashldi3.o bswapsdi2.o \

		 head.o $(OBJS)



clean-files += lib1funcs.S ashldi3.S bswapsdi2.S hyp-stub.S



KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING



ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin \
@@ -134,23 +130,7 @@ endif 
# Next argument is a linker script

LDFLAGS_vmlinux += -T



# For __aeabi_uidivmod

lib1funcs = $(obj)/lib1funcs.o



$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S

	$(call cmd,shipped)



# For __aeabi_llsl

ashldi3 = $(obj)/ashldi3.o



$(obj)/ashldi3.S: $(srctree)/arch/$(SRCARCH)/lib/ashldi3.S

	$(call cmd,shipped)



# For __bswapsi2, __bswapdi2

bswapsdi2 = $(obj)/bswapsdi2.o



$(obj)/bswapsdi2.S: $(srctree)/arch/$(SRCARCH)/lib/bswapsdi2.S

	$(call cmd,shipped)

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
@@ -175,8 +155,8 @@ fi 
efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \

		$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \

		$(bswapsdi2) $(efi-obj-y) FORCE

		$(addprefix $(obj)/, $(OBJS)) \

		$(efi-obj-y) FORCE

	@$(check_for_multiple_zreladdr)

	$(call if_changed,ld)

	@$(check_for_bad_syms)
@@ -187,11 +167,4 @@ $(obj)/piggy_data: $(obj)/../Image FORCE 
$(obj)/piggy.o: $(obj)/piggy_data



CFLAGS_font.o := -Dstatic=



$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)



AFLAGS_hyp-stub.o := -Wa,-march=armv7-a
 


$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S

	$(call cmd,shipped)

arch/arm/boot/compressed/ashldi3.S

0 → 100644
+3 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* For __aeabi_llsl */

#include "../../lib/ashldi3.S"

arch/arm/boot/compressed/bswapsdi2.S

0 → 100644
+3 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* For __bswapsi2, __bswapdi2 */

#include "../../lib/bswapsdi2.S"

arch/arm/boot/compressed/font.c

0 → 100644
+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include "../../../../lib/fonts/font_acorn_8x8.c"