X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=Makefile;h=fb94072fd80d30497020649f7eb04c33fb46d4f4;hb=7e30309968c18b504320275d527914272fbe1a1c;hp=d9cf3a40eda9d20ce03ceda2ebc921a95dc2aea7;hpb=0bb78166dfda3d4ff07dd4bd04caa6244a867927;p=sfrench%2Fcifs-2.6.git

diff --git a/Makefile b/Makefile
index d9cf3a40eda9..fb94072fd80d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 16
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
 NAME = Fearless Coyote
 
 # *DOCUMENTATION*
@@ -489,6 +489,11 @@ KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
 KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
 endif
 
+RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
+RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk
+RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))
+export RETPOLINE_CFLAGS
+
 ifeq ($(config-targets),1)
 # ===========================================================================
 # *config targets only - make sure prerequisites are updated, and descend