From 3a8961d3a12f3df35217dc054df9f029d8b285ab Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 07:37:48 +0200 Subject: [PATCH] Revert "ANDROID: x86, build: allow LTO_CLANG and THINLTO to be selected" This reverts commit 9145ef459e30660f6cdb355bc1b7cca7f5b51292 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: I970783b2bc64c725d0478991c82bcdc089ee8a19 --- arch/x86/Kconfig | 2 -- arch/x86/Makefile | 5 ----- 2 files changed, 7 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0ac9297d0401..763ca0f06a8d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -92,8 +92,6 @@ config X86 select ARCH_SUPPORTS_ACPI select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_NUMA_BALANCING if X86_64 - select ARCH_SUPPORTS_LTO_CLANG if X86_64 - select ARCH_SUPPORTS_THINLTO if X86_64 select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS diff --git a/arch/x86/Makefile b/arch/x86/Makefile index a1abc1e081ad..00e378de8bc0 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -188,11 +188,6 @@ ifdef CONFIG_X86_64 KBUILD_LDFLAGS += $(call ld-option, -z max-page-size=0x200000) endif -ifdef CONFIG_LTO_CLANG -KBUILD_LDFLAGS += -plugin-opt=-code-model=kernel \ - -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8) -endif - # Workaround for a gcc prelease that unfortunately was shipped in a suse release KBUILD_CFLAGS += -Wno-sign-compare #