aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-12-28 15:17:40 +0000
committerSam James <sam@gentoo.org>2022-12-28 15:17:40 +0000
commit82dd3e00f1838f3ce00c4a156e67d73bbb1a2760 (patch)
treee9ba54d73cf21ada7f8e13daa5bc24cdc0c2eb5c
parentcrossdev: force off hardened in more cases (avoid leaking hardened from host) (diff)
downloadcrossdev-82dd3e00f1838f3ce00c4a156e67d73bbb1a2760.tar.gz
crossdev-82dd3e00f1838f3ce00c4a156e67d73bbb1a2760.tar.bz2
crossdev-82dd3e00f1838f3ce00c4a156e67d73bbb1a2760.zip
crossdev: adapt to new USE=default-stack-clash-protection20221228
Signed-off-by: Sam James <sam@gentoo.org>
-rwxr-xr-xcrossdev6
1 files 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
}