From 82dd3e00f1838f3ce00c4a156e67d73bbb1a2760 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 28 Dec 2022 15:17:40 +0000
Subject: crossdev: adapt to new USE=default-stack-clash-protection

Signed-off-by: Sam James <sam@gentoo.org>
---
 crossdev | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crossdev b/crossdev
index caf912e..de9ce7a 100755
--- a/crossdev
+++ b/crossdev
@@ -289,8 +289,8 @@ parse_target() {
 		      KPKG="[none]";
 		      LCAT="dev-util"; LPKG="mingw64-runtime"
 		      WITH_DEF_HEADERS="yes" # gcc can't boot without headers: bug #693770
-		      GUSE+=" -hardened" # gcc ICEs as libssp/ssp.c:186:1: internal compiler error: in seh_emit_stackalloc
-		      GMASK+=" hardened"
+		      GMASK+=" default-stack-clash-protection hardened"
+		      GUSE+=" -default-stack-clash-protection -hardened" # gcc ICEs as libssp/ssp.c:186:1: internal compiler error: in seh_emit_stackalloc
 		      ;;
 
 		mingw*|*-mingw*)
@@ -440,7 +440,7 @@ parse_target() {
 	if [[ $ssp_support = "no" ]]; then
 		# ssp is >=gcc-6, nossp is <gcc-6
 		# blacklist hardened too because it'll force -fstack-clash-protection
-		GMASK+=" ssp hardened -nossp"
+		GMASK+=" default-stack-clash-protection ssp hardened -nossp"
 		GFORCE+=" nossp"
 	fi
 }
-- 
cgit v1.2.3-65-gdbad