X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=1fe5d2a2cfd9f77855fc58c484cee3433e3047b9;hb=7b22ae90b00f6f0174e033220627ed6a36028900;hp=c78f3d71a905a59ea735b9e125a367308f288a0d;hpb=cd2f01de2da97237718dc8fdd2b3540b624d5024;p=mirror_ubuntu-bionic-kernel.git

diff --git a/Makefile b/Makefile
index c78f3d71a905..1fe5d2a2cfd9 100644
--- a/Makefile
+++ b/Makefile
@@ -869,6 +869,12 @@ KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)
 # Require designated initializers for all marked structures
 KBUILD_CFLAGS   += $(call cc-option,-Werror=designated-init)
 
+# 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)