diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2020-06-04 11:49:55 -0700 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2020-06-04 11:49:55 -0700 |
| commit | 23f7a94bc9c762e80495bd69b6759fbe2c03f835 (patch) | |
| tree | 3319eba22c32164c4027c6d6c48da2419bd5d0cc | |
| parent | 8381e52b2c1b312353445c560eab60f887784f71 (diff) | |
ANDROID: arm64: vdso: wrap -n in ld-optionASB-2020-06-05_4.14-q
ld.lld distributed in clang-r353983c AOSP LLVM release (the final AOSP
LLVM release for Android Q) did not support `-n` linker flag. It was
eventually added to clang-r360593.
Android OEM's may wish to still use ld.lld to link their kernels for Q.
This flag was disabled for Pixel 4 in go/pag/1258086. This patch is
equivalent, but rebased on upstream changes that removed cc-ldoption in
favor of ld-option.
For Android R, the final AOSP LLVM release, clang-r383902 has long
supported `-n` for ld.lld.
Change-Id: Iab41c9e1039e163113b428fc487a4a0708822faa
Bug: 63740206
Bug: 157279372
Link: https://github.com/ClangBuiltLinux/linux/issues/340
Link: https://bugs.llvm.org/show_bug.cgi?id=40542
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
| -rw-r--r-- | arch/arm64/kernel/vdso/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index 01d6f496d1eb..b2c1695c4d4c 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -13,7 +13,7 @@ targets := $(obj-vdso) vdso.so vdso.so.dbg obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 --hash-style=sysv \ - --build-id -n -T + --build-id $(call ld-option,-n) -T ccflags-y += $(DISABLE_LTO) # Disable gcov profiling for VDSO code |