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

Commit 74d07ccc authored by Sami Tolvanen's avatar Sami Tolvanen
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: 145297900
Change-Id: I95a9c68ee76fdc8f4cee5c5bd1356fc90de1680c
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent ced5b64c

arch/x86/entry/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ ARCH_REL_TYPE_ABS := R_X86_64_JUMP_SLOT|R_X86_64_GLOB_DAT|R_X86_64_RELATIVE| 
ARCH_REL_TYPE_ABS += R_386_GLOB_DAT|R_386_JMP_SLOT|R_386_RELATIVE

include $(srctree)/lib/vdso/Makefile



KBUILD_CFLAGS += $(DISABLE_LTO)

KASAN_SANITIZE			:= n

UBSAN_SANITIZE			:= n

OBJECT_FILES_NON_STANDARD	:= y
@@ -82,7 +81,7 @@ ifneq ($(RETPOLINE_VDSO_CFLAGS),) 
endif

endif



$(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)

$(vobjs): KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO) $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)



#

# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
@@ -146,6 +145,7 @@ 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 $(CC_FLAGS_LTO),$(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)