X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=Makefile;h=a7bc91cbac8fcb1f306185fb08362693508ef44d;hb=9682468747390c14962114f261cd76ba188ed987;hp=f0d118b86287832467015f0840ff283de94423cc;hpb=9b98f92ca446f4302607a88fbb67619af968f3cf;p=sfrench%2Fcifs-2.6.git

diff --git a/Makefile b/Makefile
index f0d118b86287..a7bc91cbac8f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 5
 PATCHLEVEL = 7
 SUBLEVEL = 0
-EXTRAVERSION = -rc7
+EXTRAVERSION =
 NAME = Kleptomaniac Octopus
 
 # *DOCUMENTATION*
@@ -862,6 +862,12 @@ ifdef CONFIG_LIVEPATCH
 KBUILD_CFLAGS += $(call cc-option, -flive-patching=inline-clone)
 endif
 
+ifdef CONFIG_SHADOW_CALL_STACK
+CC_FLAGS_SCS	:= -fsanitize=shadow-call-stack
+KBUILD_CFLAGS	+= $(CC_FLAGS_SCS)
+export CC_FLAGS_SCS
+endif
+
 # arch Makefile may override CC so keep this after arch Makefile is included
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)