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

Commit a9ee8bba authored by Laura Abbott's avatar Laura Abbott Committed by Alistair Delva
Browse files

BACKPORT: arm64: vdso: Explicitly add build-id option 



Commit 691efbedc60d ("arm64: vdso: use $(LD) instead of $(CC) to
link VDSO") switched to using LD explicitly. The --build-id option
needs to be passed explicitly, similar to x86. Add this option.

Fixes: 691efbedc60d ("arm64: vdso: use $(LD) instead of $(CC) to link VDSO")
Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
[will: drop redundant use of 'call ld-option' as requested by Masahiro]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>

Change-Id: I4a0f5c1bb60bda682221a7ff96a783bf8731cc00
[nd: conflict due to ANDROID LTO and CFI]
(cherry picked from commit 7a0a93c51799edc45ee57c6cc1679aa94f1e03d5)
Bug: 153418016
Bug: 157279372
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
parent 64ea9b4b

arch/arm64/kernel/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ obj-vdso := gettimeofday.o note.o sigreturn.o 
targets := $(obj-vdso) vdso.so vdso.so.dbg

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



ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 \

		$(call ld-option, --hash-style=sysv) -n -T

ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1  --hash-style=sysv \

		--build-id -n -T

ccflags-y += $(DISABLE_LTO)



CFLAGS_REMOVE_vgettimeofday.o += $(CC_FLAGS_SCS)