From: Masahiro Yamada Date: Mon, 12 Nov 2018 02:35:19 +0000 (+0900) Subject: x86/um: Remove -fno-unit-at-a-time workaround for pre-4.0 GCC X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~3882^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=829889ac4a7d26858860c297e64051bd27ce8fbe;p=mirror_ubuntu-focal-kernel.git x86/um: Remove -fno-unit-at-a-time workaround for pre-4.0 GCC Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6") bumped the minimum GCC version to 4.6 for all architectures. '$(call cc-option,-fno-unit-at-a-time)' is now dead code since '$(cc-version) -lt 0400' is always false. Remove it. Signed-off-by: Masahiro Yamada Signed-off-by: Borislav Petkov Acked-by: Richard Weinberger Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Michael Ellerman Cc: Thomas Gleixner Cc: linuxppc-dev@lists.ozlabs.org Cc: x86-ml Link: https://lkml.kernel.org/r/1541990120-9643-2-git-send-email-yamada.masahiro@socionext.com --- diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um index 91085a08de6c..577976b7d1f8 100644 --- a/arch/x86/Makefile.um +++ b/arch/x86/Makefile.um @@ -26,12 +26,8 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) # an unresolved reference. cflags-y += -ffreestanding -# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use -# a lot more stack due to the lack of sharing of stacklots. Also, gcc -# 4.3.0 needs -funit-at-a-time for extern inline functions. -KBUILD_CFLAGS += $(shell if [ $(cc-version) -lt 0400 ] ; then \ - echo $(call cc-option,-fno-unit-at-a-time); \ - else echo $(call cc-option,-funit-at-a-time); fi ;) +# gcc 4.3.0 needs -funit-at-a-time for extern inline functions. +KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) KBUILD_CFLAGS += $(cflags-y)