From 28ec20d517e494deed48497b1c478f5bd4dff1a6 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Wed, 14 Jun 2017 17:00:32 +0200
Subject: [PATCH] toolchain-glibc.eclass: Always enable stack guard
 randomization (bug #621742).

Signed-off-by: Matthias Maier <tamiko@gentoo.org>
---
 eclass/toolchain-glibc.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index eba829cd2f628..d1e79975ccff2 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -780,7 +780,6 @@ glibc_do_configure() {
 	[[ -d ports ]] && addons+=",ports"
 	popd > /dev/null
 
-	myconf+=( $(use_enable hardened stackguard-randomization) )
 	if has_version '<sys-libs/glibc-2.13' ; then
 		myconf+=( --enable-old-ssp-compat )
 	fi
@@ -789,6 +788,12 @@ glibc_do_configure() {
 		myconf+=( --enable-stack-protector=all )
 	fi
 
+	if version_is_at_least 2.25 ; then
+		myconf+=( --enable-stackguard-randomization )
+	else
+		myconf+=( $(use_enable hardened stackguard-randomization) )
+	fi
+
 	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
 	if [[ $1 == "linuxthreads" ]] ; then