From 262afca4ac3058ad3853c84c95cf1082872552fc Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Mon, 10 Jun 2019 19:58:33 -0700 Subject: [PATCH] x86: Fix RETPOLINE_CFLAGS check The 4.9.11 merge did not properly resolve the conflict between commit 084a9b8fa3c6 ("Revert "x86: Allow generating user-space headers without a compiler"") in kernel/common and commit d92c66b30f93 ("x86/build: Fix compiler support check for CONFIG_RETPOLINE"). The archprepare target should have been added back, otherwise this check will not work properly. This can be verified by enabling CONFIG_RETPOLINE and inverting the RETPOLINE_CFLAGS check; before this patch, the build will succeed but after, the build will properly terminate. Change-Id: I18b13ce1e73c2023e2e1ce07593744b3f7929ac9 Fixes: a87fb6b90d85 ("Merge 4.19.11 into android-4.19") Signed-off-by: Nathan Chancellor --- arch/x86/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 723bffd979e9..45bb65d01a21 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -308,6 +308,8 @@ PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/x86/entry/vdso $@ +archprepare: checkbin +checkbin: ifdef CONFIG_RETPOLINE ifeq ($(RETPOLINE_CFLAGS),) @echo "You are building kernel with non-retpoline compiler." >&2