Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9a7086 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Revert "arm64: Fix vdso-offsets.h dependency" 



This reverts commit 90f777be.

While this commit was aimed at fixing the dependencies, with a large
make -j the vdso-offsets.h file is not generated, leading to build
failures.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 16c11325

arch/arm64/kernel/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ obj-m += $(arm64-obj-m) 
head-y					:= head.o

extra-y					+= $(head-y) vmlinux.lds



# Check that the vDSO symbol offsets header file is up to date and re-generate

# it if necessary.

$(objtree)/include/generated/vdso-offsets.h: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/vdso $@
 
# vDSO - this must be built first to generate the symbol offsets

$(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h

$(obj)/vdso/vdso-offsets.h: $(obj)/vdso

arch/arm64/kernel/vdso/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ GCOV_PROFILE := n 
ccflags-y += -Wl,-shared



obj-y += vdso.o

extra-y += vdso.lds

extra-y += vdso.lds vdso-offsets.h

CPPFLAGS_vdso.lds += -P -C -U$(ARCH)



# Force dependency (incbin is bad)
@@ -42,10 +42,11 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh

quiet_cmd_vdsosym = VDSOSYM $@

define cmd_vdsosym

	$(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@

	$(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ && \

	cp $@ include/generated/

endef



$(objtree)/include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE

$(obj)/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE

	$(call if_changed,vdsosym)



# Assembly rules for the .S files