Unverified Commit c6898d66 authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

riscv: Check that vdso does not contain any dynamic relocations 



Like other architectures, use the common cmd_vdso_check to make sure of
that.

Reviewed-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Tested-by: default avatarVladimir Isaev <vladimir.isaev@syntacore.com>
Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: default avatarGuo Ren <guoren@kernel.org>
Link: https://lore.kernel.org/r/20241016083625.136311-3-alexghiti@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent bf40167d

arch/riscv/kernel/vdso/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ $(obj)/vdso.o: $(obj)/vdso.so 


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

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

	$(call if_changed,vdsold)

	$(call if_changed,vdsold_and_check)

LDFLAGS_vdso.so.dbg = -shared -soname=linux-vdso.so.1 \

	--build-id=sha1 --hash-style=both --eh-frame-hdr
@@ -65,7 +65,8 @@ include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE 
# actual build commands

# The DSO images are built using a special linker script

# Make sure only to export the intended __vdso_xxx symbol offsets.

quiet_cmd_vdsold = VDSOLD  $@

      cmd_vdsold = $(LD) $(ld_flags) -T $(filter-out FORCE,$^) -o $@.tmp && \

quiet_cmd_vdsold_and_check = VDSOLD  $@

      cmd_vdsold_and_check = $(LD) $(ld_flags) -T $(filter-out FORCE,$^) -o $@.tmp && \

                   $(OBJCOPY) $(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp $@ && \

                   rm $@.tmp
 
                   rm $@.tmp && \

                   $(cmd_vdso_check)