Commit 7fe2de24 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/vdso: Stripped VDSO is not needed, don't build it 



Since commit 24b659a1 ("powerpc: Use unstripped VDSO image for
more accurate profiling data"), only the unstripped VDSO image
has been used.

Partially revert commit 8150caad ("[POWERPC] powerpc vDSO: install
unstripped copies on disk") to avoid building the stripped version.

And the unstripped version in $(MODLIB)/vdso/ is not required
anymore as it is the one embedded in the kernel image.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5986ca25be44fe6e9790486304507f240077d8c4.1601197618.git.christophe.leroy@csgroup.eu
parent ef75e731

arch/powerpc/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -406,15 +406,6 @@ PHONY += install 
install:

	$(Q)$(MAKE) $(build)=$(boot) install



PHONY += vdso_install

vdso_install:

ifdef CONFIG_PPC64

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@

endif

ifdef CONFIG_VDSO32

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@

endif



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/powerpc/kernel/vdso32/Makefile

+2 −17
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ CC32FLAGS += -m32 
KBUILD_CFLAGS := $(filter-out -mcmodel=medium,$(KBUILD_CFLAGS))

endif



targets := $(obj-vdso32) vdso32.so vdso32.so.dbg

targets := $(obj-vdso32) vdso32.so.dbg

obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))



GCOV_PROFILE := n
@@ -47,17 +47,12 @@ targets += vdso32.lds 
CPPFLAGS_vdso32.lds += -P -C -Upowerpc



# Force dependency (incbin is bad)

$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so

$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so.dbg



# link rule for the .so file, .lds has to be first

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday.o FORCE

	$(call if_changed,vdso32ld_and_check)



# strip rule for the .so file

$(obj)/%.so: OBJCOPYFLAGS := -S

$(obj)/%.so: $(obj)/%.so.dbg FORCE

	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso32): %.o: %.S FORCE

	$(call if_changed_dep,vdso32as)
@@ -71,13 +66,3 @@ quiet_cmd_vdso32as = VDSO32A $@ 
      cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $<

quiet_cmd_vdso32cc = VDSO32C $@

      cmd_vdso32cc = $(VDSOCC) $(c_flags) $(CC32FLAGS) -c -o $@ $<
 


# install commands for the unstripped file

quiet_cmd_vdso_install = INSTALL $@

      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@



vdso32.so: $(obj)/vdso32.so.dbg

	@mkdir -p $(MODLIB)/vdso

	$(call cmd,vdso_install)



vdso_install: vdso32.so

arch/powerpc/kernel/vdso64/Makefile

+2 −17
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ endif 


# Build rules



targets := $(obj-vdso64) vdso64.so vdso64.so.dbg

targets := $(obj-vdso64) vdso64.so.dbg

obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))



GCOV_PROFILE := n
@@ -36,27 +36,12 @@ CPPFLAGS_vdso64.lds += -P -C -U$(ARCH) 
$(obj)/vgettimeofday.o: %.o: %.c FORCE



# Force dependency (incbin is bad)

$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so

$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so.dbg



# link rule for the .so file, .lds has to be first

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday.o FORCE

	$(call if_changed,vdso64ld_and_check)



# strip rule for the .so file

$(obj)/%.so: OBJCOPYFLAGS := -S

$(obj)/%.so: $(obj)/%.so.dbg FORCE

	$(call if_changed,objcopy)



# actual build commands

quiet_cmd_vdso64ld_and_check = VDSO64L $@

      cmd_vdso64ld_and_check = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^); $(cmd_vdso_check)
 


# install commands for the unstripped file

quiet_cmd_vdso_install = INSTALL $@

      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@



vdso64.so: $(obj)/vdso64.so.dbg

	@mkdir -p $(MODLIB)/vdso

	$(call cmd,vdso_install)



vdso_install: vdso64.so