From c268590c556cb766e1ca3f55fde8a40cdde19c44 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 27 Sep 2022 15:10:20 +0100
Subject: gentoo auto-resync : 27:09:2022 - 15:10:20

---
 .../files/gcc-11.3.0-musl-calloc.patch             | 33 ----------------------
 .../files/gcc-12.2.0-drop-cflags-sed.patch         | 23 +++++++++++++++
 2 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch
 create mode 100644 dev-util/mingw64-toolchain/files/gcc-12.2.0-drop-cflags-sed.patch

(limited to 'dev-util/mingw64-toolchain/files')

diff --git a/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch b/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch
deleted file mode 100644
index 71602df60cca..000000000000
--- a/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/855002
-https://gcc.gnu.org/PR104799
-https://gcc.gnu.org/PR106102
---- a/gcc/gcc/cp/mapper-client.cc
-+++ b/gcc/gcc/cp/mapper-client.cc
-@@ -29,2 +29,3 @@
- #define INCLUDE_MAP
-+#include <pthread.h>
- #include "system.h"
---- a/gcc/gcc/cp/mapper-resolver.cc
-+++ b/gcc/gcc/cp/mapper-resolver.cc
-@@ -27,2 +27,3 @@
- #define INCLUDE_MAP
-+#include <pthread.h>
- #include "system.h"
---- a/gcc/gcc/cp/module.cc
-+++ b/gcc/gcc/cp/module.cc
-@@ -206,2 +206,3 @@
- #define INCLUDE_VECTOR
-+#include <pthread.h>
- #include "system.h"
---- a/gcc/libcc1/libcc1plugin.cc
-+++ b/gcc/libcc1/libcc1plugin.cc
-@@ -19,2 +19,3 @@
- 
-+#include <pthread.h>
- #include <cc1plugin-config.h>
---- a/gcc/libcc1/libcp1plugin.cc
-+++ b/gcc/libcc1/libcp1plugin.cc
-@@ -20,2 +20,3 @@
- 
-+#include <pthread.h>
- #include <cc1plugin-config.h>
diff --git a/dev-util/mingw64-toolchain/files/gcc-12.2.0-drop-cflags-sed.patch b/dev-util/mingw64-toolchain/files/gcc-12.2.0-drop-cflags-sed.patch
new file mode 100644
index 000000000000..754bc11a1687
--- /dev/null
+++ b/dev-util/mingw64-toolchain/files/gcc-12.2.0-drop-cflags-sed.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/849722
+https://github.com/InBetweenNames/gentooLTO/issues/846
+https://github.com/vaeth/portage-bashrc-mv/issues/11
+--- a/gcc/gcc/configure
++++ b/gcc/gcc/configure
+@@ -5389,7 +5388,0 @@
+-# Remove the -O2: for historical reasons, unless bootstrapping we prefer
+-# optimizations to be activated explicitly by the toplevel.
+-case "$CC" in
+-  */prev-gcc/xgcc*) ;;
+-  *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[ 	]//" -e "s/-O[gs][ 	]//" -e "s/-O[0-9]*[ 	]//" `
+-     CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[ 	]//" -e "s/-O[gs][ 	]//" -e "s/-O[0-9]*[ 	]//" ` ;;
+-esac
+--- a/gcc/gcc/configure.ac
++++ b/gcc/gcc/configure.ac
+@@ -443,7 +442,0 @@
+-# Remove the -O2: for historical reasons, unless bootstrapping we prefer
+-# optimizations to be activated explicitly by the toplevel.
+-case "$CC" in
+-  */prev-gcc/xgcc*) ;;
+-  *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[[ 	]]//" -e "s/-O[[gs]][[ 	]]//" -e "s/-O[[0-9]]*[[ 	]]//" `
+-     CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[[ 	]]//" -e "s/-O[[gs]][[ 	]]//" -e "s/-O[[0-9]]*[[ 	]]//" ` ;;
+-esac
-- 
cgit v1.2.3