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

Commit 5f8f071e authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

ANDROID: x86/vdso: disable LTO only for VDSO 



Instead of disabling LTO for all the code in the directory, only
disable it for the VDSO itself.

Bug: 133186739
Change-Id: I02e34b75e022982f9884e238aec89486890dd4bb
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent cdd93e08

arch/x86/entry/vdso/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# Building vDSO images for x86.

#



KBUILD_CFLAGS += $(DISABLE_LTO)

KASAN_SANITIZE			:= n

UBSAN_SANITIZE			:= n

OBJECT_FILES_NON_STANDARD	:= y
@@ -68,7 +67,7 @@ $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE 
CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \

       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \

       -fno-omit-frame-pointer -foptimize-sibling-calls \

       -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO

       -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO $(DISABLE_LTO)



ifdef CONFIG_RETPOLINE

ifneq ($(RETPOLINE_VDSO_CFLAGS),)
@@ -139,6 +138,8 @@ KBUILD_CFLAGS_32 := $(filter-out -fno-pic,$(KBUILD_CFLAGS_32)) 
KBUILD_CFLAGS_32 := $(filter-out -mfentry,$(KBUILD_CFLAGS_32))

KBUILD_CFLAGS_32 := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS_32))

KBUILD_CFLAGS_32 := $(filter-out $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS_32))

KBUILD_CFLAGS_32 := $(filter-out $(LTO_CFLAGS),$(KBUILD_CFLAGS_32))

KBUILD_CFLAGS_32 := $(filter-out $(CFI_CFLAGS),$(KBUILD_CFLAGS_32))

KBUILD_CFLAGS_32 += -m32 -msoft-float -mregparm=0 -fpic

KBUILD_CFLAGS_32 += $(call cc-option, -fno-stack-protector)

KBUILD_CFLAGS_32 += $(call cc-option, -foptimize-sibling-calls)