From 068dbd8a6da82eaa388e7373a2aa4f72fa328067 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 08:49:36 +0200 Subject: [PATCH] Revert "ANDROID: efi/libstub: disable LTO" This reverts commit a4fa5799c0b342d25f38f5c6cd31984efe2aa61c as the LTO feature causes merge issues with 5.8-rc1. So remove it for now and allow the developer to add the latest version of the patches later on. Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: Ia81e7927c504b549faf75c65ab3418bda0930d79 --- drivers/firmware/efi/libstub/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 67a45621373c..cce4a7436052 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -33,8 +33,8 @@ KBUILD_CFLAGS := $(cflags-y) -Os -DDISABLE_BRANCH_PROFILING \ $(call cc-option,-fno-addrsig) \ -D__DISABLE_EXPORTS -# remove LTO and SCS flags from all objects in this directory -KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS) $(CC_FLAGS_LTO), $(KBUILD_CFLAGS)) +# remove SCS flags from all objects in this directory +KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) GCOV_PROFILE := n KASAN_SANITIZE := n