Skip to content

Commit 691efbe

Browse files
masahir0ywildea01
authored andcommitted
arm64: vdso: use $(LD) instead of $(CC) to link VDSO
We use $(LD) to link vmlinux, modules, decompressors, etc. VDSO is the only exceptional case where $(CC) is used as the linker driver, but I do not know why we need to do so. VDSO uses a special linker script, and does not link standard libraries at all. I changed the Makefile to use $(LD) rather than $(CC). I tested this, and VDSO worked for me. Users will be able to use their favorite linker (e.g. lld instead of of bfd) by passing LD= from the command line. My plan is to rewrite all VDSO Makefiles to use $(LD), then delete cc-ldoption. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
1 parent d263119 commit 691efbe

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

arch/arm64/kernel/vdso/Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ obj-vdso := gettimeofday.o note.o sigreturn.o
1212
targets := $(obj-vdso) vdso.so vdso.so.dbg
1313
obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
1414

15-
ccflags-y := -shared -fno-common -fno-builtin
16-
ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 \
17-
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
15+
ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 \
16+
$(call ld-option, --hash-style=sysv) -n -T
1817

1918
# Disable gcov profiling for VDSO code
2019
GCOV_PROFILE := n
2120

22-
# Workaround for bare-metal (ELF) toolchains that neglect to pass -shared
23-
# down to collect2, resulting in silent corruption of the vDSO image.
24-
ccflags-y += -Wl,-shared
25-
2621
obj-y += vdso.o
2722
extra-y += vdso.lds
2823
CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
@@ -32,7 +27,7 @@ $(obj)/vdso.o : $(obj)/vdso.so
3227

3328
# Link rule for the .so file, .lds has to be first
3429
$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
35-
$(call if_changed,vdsold)
30+
$(call if_changed,ld)
3631

3732
# Strip rule for the .so file
3833
$(obj)/%.so: OBJCOPYFLAGS := -S
@@ -52,8 +47,6 @@ $(obj-vdso): %.o: %.S FORCE
5247
$(call if_changed_dep,vdsoas)
5348

5449
# Actual build commands
55-
quiet_cmd_vdsold = VDSOL $@
56-
cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $(real-prereqs) -o $@
5750
quiet_cmd_vdsoas = VDSOA $@
5851
cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
5952

0 commit comments

Comments
 (0)