[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Frysinger]

commit:     5bd3e5acff5ad019ef5f6443eeb7df718b30e9c6
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 22:46:14 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 22:46:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd3e5ac

toolchain.eclass: add USE=ssp for gcc-6 to control default stack-protector-strong behavior

 eclass/toolchain.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ce21d9a..d93f51d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -152,7 +152,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
 	# the older versions, we don't want to bother supporting it.  #448024
 	tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize )
 	tc_version_is_at_least 4.9 && IUSE+=" cilk"
-	tc_version_is_at_least 6.0 && IUSE+=" pie"
+	tc_version_is_at_least 6.0 && IUSE+=" pie +ssp"
 fi
 
 IUSE+=" ${IUSE_DEF[*]/#/+}"
@@ -1193,7 +1193,11 @@ toolchain_src_configure() {
 	fi
 
 	if tc_version_is_at_least 6.0 ; then
-		confgcc+=( $(use_enable pie default-pie) )
+		confgcc+=(
+			$(use_enable pie default-pie)
+			# This defaults to -fstack-protector-strong.
+			$(use_enable ssp default-ssp)
+		)
 	fi
 
 	# Disable gcc info regeneration -- it ships with generated info pages