diff options
| author | Seth Forshee <seth.forshee@canonical.com> | 2019-07-17 11:06:26 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-10 11:25:39 +0100 |
| commit | 2103cc67dbfbcfc5c5838d4d0859631e9f3dfce3 (patch) | |
| tree | 32aa172c0738231e8371e53afa41c9c92ed40456 /Makefile | |
| parent | b125188db9b12a3d6f7fc7d3a66929f2ffae7872 (diff) | |
| download | linux-stable-2103cc67dbfbcfc5c5838d4d0859631e9f3dfce3.tar.gz linux-stable-2103cc67dbfbcfc5c5838d4d0859631e9f3dfce3.tar.bz2 linux-stable-2103cc67dbfbcfc5c5838d4d0859631e9f3dfce3.zip | |
kbuild: add -fcf-protection=none when using retpoline flags
[ Upstream commit 29be86d7f9cb18df4123f309ac7857570513e8bc ]
The gcc -fcf-protection=branch option is not compatible with
-mindirect-branch=thunk-extern. The latter is used when
CONFIG_RETPOLINE is selected, and this will fail to build with
a gcc which has -fcf-protection=branch enabled by default. Adding
-fcf-protection=none when building with retpoline enabled
prevents such build failures.
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -843,6 +843,12 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) # change __FILE__ to the relative path from the srctree KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) +# ensure -fcf-protection is disabled when using retpoline as it is +# incompatible with -mindirect-branch=thunk-extern +ifdef CONFIG_RETPOLINE +KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none) +endif + # use the deterministic mode of AR if available KBUILD_ARFLAGS := $(call ar-option,D) |