The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: 769e0fe1171e95d90ea5a2d6d0b2bdc7d5d2e7b2
Gitweb:
https://git.kernel.org/tip/769e0fe1171e95d90ea5a2d6d0b2bdc7d5d2e7b2
Author: Ard Biesheuvel <a...@kernel.org>
AuthorDate: Thu, 09 Jul 2020 09:59:57 +03:00
Committer: Ard Biesheuvel <a...@kernel.org>
CommitterDate: Thu, 09 Jul 2020 10:14:29 +03:00
efi: Revert "efi/x86: Fix build with gcc 4"
This reverts commit 5435f73d5c4a1b75, which is no longer needed now
that the minimum GCC version has been bumped to v4.9
Signed-off-by: Ard Biesheuvel <a...@kernel.org>
---
drivers/firmware/efi/libstub/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/libstub/Makefile
b/drivers/firmware/efi/libstub/Makefile
index 4cce372..75daaf2 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -6,8 +6,7 @@
# enabled, even if doing so doesn't break the build.
#
cflags-$(CONFIG_X86_32) := -march=i386
-cflags-$(CONFIG_X86_64) := -mcmodel=small \
- $(call cc-option,-maccumulate-outgoing-args)
+cflags-$(CONFIG_X86_64) := -mcmodel=small
cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ \
-fPIC -fno-strict-aliasing -mno-red-zone \
-mno-mmx -mno-sse -fshort-wchar \
