forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

x86: Fix RETPOLINE_CFLAGS check

Browse source 
The 4.9.11 merge did not properly resolve the conflict between commit
084a9b8fa3 ("Revert "x86: Allow generating user-space headers without
a compiler"") in kernel/common and commit d92c66b30f ("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: a87fb6b90d ("Merge 4.19.11 into android-4.19")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
This commit is contained in:
Nathan Chancellor 2019-06-10 19:58:33 -07:00
commit 262afca4ac
No known key found for this signature in database
GPG key ID: 99739260CB6CB716
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/Makefile
View file

@ -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