[tip: x86/build] x86/build: Remove cc-option for GCC retpoline flags

[tip-bot2 for Nathan Chancellor]

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     5d6d30eca4dd1c9e8515a8d4b13106205d5c0ec4
Gitweb:        https://git.kernel.org/tip/5d6d30eca4dd1c9e8515a8d4b13106205d5c0ec4
Author:        Nathan Chancellor <nathan@xxxxxxxxxx>
AuthorDate:    Thu, 14 Aug 2025 18:31:37 -07:00
Committer:     Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Fri, 15 Aug 2025 11:25:48 +02:00

x86/build: Remove cc-option for GCC retpoline flags

The minimum supported version of GCC to build the x86 kernel was bumped
to GCC 8.1 in

  a3e8fe814ad1 ("x86/build: Raise the minimum GCC version to 8.1").

'-mindirect-branch' and '-mindirect-branch-register' were first supported in
GCC 8.1, so there is no need to call cc-option to inquire if it is supported.

Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Link: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=da99fd4a3ca06b43b08ba8d96dab84e83ac90aa7
Link: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d543c04b795f8af4ebe5b3d5f38156ef4e5734f1
Link: https://lore.kernel.org/20250814-x86-min-ver-cleanups-v1-1-ff7f19457523@xxxxxxxxxx
---
 arch/x86/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 1913d34..ed56573 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -13,8 +13,8 @@ else
 endif
 
 ifdef CONFIG_CC_IS_GCC
-RETPOLINE_CFLAGS	:= $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
-RETPOLINE_VDSO_CFLAGS	:= $(call cc-option,-mindirect-branch=thunk-inline -mindirect-branch-register)
+RETPOLINE_CFLAGS	:= -mindirect-branch=thunk-extern -mindirect-branch-register
+RETPOLINE_VDSO_CFLAGS	:= -mindirect-branch=thunk-inline -mindirect-branch-register
 endif
 ifdef CONFIG_CC_IS_CLANG
 RETPOLINE_CFLAGS	:= -mretpoline-external-thunk