From 11ccbe463c8abc9b54505ea9e84819f574a31717 Mon Sep 17 00:00:00 2001
From: inference <admin@inferencium.net>
Date: Fri, 26 Aug 2022 18:12:36 +0100
Subject: [PATCH] Remove variable zero initialisation compiler hardening flag
 in GCC envs due to it breaking GCC.

---
 portage/env/gcc-nolto-nopie.conf | 2 +-
 portage/env/gcc-nolto.conf       | 2 +-
 portage/env/gcc-nopie.conf       | 2 +-
 portage/env/gcc.conf             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/portage/env/gcc-nolto-nopie.conf b/portage/env/gcc-nolto-nopie.conf
index d84851e..b0b307c 100644
--- a/portage/env/gcc-nolto-nopie.conf
+++ b/portage/env/gcc-nolto-nopie.conf
@@ -13,7 +13,7 @@ RANLIB="ranlib"
 
 # Flags.
 ## Hardening flags.
-C_SEC="-fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -ftrivial-auto-var-init=zero -fwrapv"
+C_SEC="-fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -fwrapv"
 LD_SEC="-Wl,--strip-all -Wl,-z,defs -Wl,-z,now -Wl,-z,relro"
 
 ## Common flags.
diff --git a/portage/env/gcc-nolto.conf b/portage/env/gcc-nolto.conf
index 2f6f60b..06c0997 100644
--- a/portage/env/gcc-nolto.conf
+++ b/portage/env/gcc-nolto.conf
@@ -13,7 +13,7 @@ RANLIB="ranlib"
 
 # Flags.
 ## Hardening flags.
-C_SEC="-fPIE -fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -ftrivial-auto-var-init=zero -fwrapv"
+C_SEC="-fPIE -fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -fwrapv"
 LD_SEC="-Wl,-pie -Wl,--strip-all -Wl,-z,defs -Wl,-z,now -Wl,-z,relro"
 
 ## Common flags.
diff --git a/portage/env/gcc-nopie.conf b/portage/env/gcc-nopie.conf
index e724b2b..1aeeb5b 100644
--- a/portage/env/gcc-nopie.conf
+++ b/portage/env/gcc-nopie.conf
@@ -13,7 +13,7 @@ RANLIB="ranlib"
 
 # Flags.
 ## Hardening flags.
-C_SEC="-fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -ftrivial-auto-var-init=zero -fwrapv"
+C_SEC="-fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -fwrapv"
 LD_SEC="-Wl,--strip-all -Wl,-z,defs -Wl,-z,now -Wl,-z,relro"
 
 ## Common flags.
diff --git a/portage/env/gcc.conf b/portage/env/gcc.conf
index 6395eba..e9b6d9e 100644
--- a/portage/env/gcc.conf
+++ b/portage/env/gcc.conf
@@ -13,7 +13,7 @@ RANLIB="ranlib"
 
 # Flags.
 ## Hardening flags.
-C_SEC="-fPIE -fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -ftrivial-auto-var-init=zero -fwrapv"
+C_SEC="-fPIE -fPIC -fstack-protector-all -fstack-clash-protection -D_FORTIFY_SOURCE=2 -fwrapv"
 LD_SEC="-Wl,-pie -Wl,--strip-all -Wl,-z,defs -Wl,-z,now -Wl,-z,relro"
 
 ## Common flags.