Index: stable/11/lib/libssp/Makefile
===================================================================
--- stable/11/lib/libssp/Makefile	(revision 359058)
+++ stable/11/lib/libssp/Makefile	(revision 359059)
@@ -1,20 +1,24 @@
 # $FreeBSD$
 
 PACKAGE=	clibs
 SHLIBDIR?=	/lib
 SHLIB=		ssp
 SHLIB_MAJOR=	0
 
 VERSION_DEF=	${.CURDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
 .PATH: ${SRCTOP}/lib/libc/secure
 CFLAGS+=	-I${SRCTOP}/lib/libc/include
 # _elf_aux_info is exported from libc as elf_aux_info(3), so just that for the
 # libssp build instead.
 CFLAGS+=	-D_elf_aux_info=elf_aux_info
 SRCS=		stack_protector.c fortify_stubs.c
 
 CFLAGS.fortify_stubs.c=	-Wno-unused-parameter
 
+# Stack protection on libssp symbols should be considered harmful, as we may
+# be talking about, for example, the guard setup constructor.
+SSP_CFLAGS:=
+
 .include <bsd.lib.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 359058)
+++ stable/11	(revision 359059)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r358993
Index: stable/12/lib/libssp/Makefile
===================================================================
--- stable/12/lib/libssp/Makefile	(revision 359058)
+++ stable/12/lib/libssp/Makefile	(revision 359059)
@@ -1,20 +1,24 @@
 # $FreeBSD$
 
 PACKAGE=	clibs
 SHLIBDIR?=	/lib
 SHLIB=		ssp
 SHLIB_MAJOR=	0
 
 VERSION_DEF=	${.CURDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
 .PATH: ${SRCTOP}/lib/libc/secure
 CFLAGS+=	-I${SRCTOP}/lib/libc/include
 # _elf_aux_info is exported from libc as elf_aux_info(3), so just that for the
 # libssp build instead.
 CFLAGS+=	-D_elf_aux_info=elf_aux_info
 SRCS=		stack_protector.c fortify_stubs.c
 
 CFLAGS.fortify_stubs.c=	-Wno-unused-parameter
 
+# Stack protection on libssp symbols should be considered harmful, as we may
+# be talking about, for example, the guard setup constructor.
+SSP_CFLAGS:=
+
 .include <bsd.lib.mk>
Index: stable/12
===================================================================
--- stable/12	(revision 359058)
+++ stable/12	(revision 359059)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r358993