12.1.0: musl: drop 50_all_calloc_libgccjit.patch

Fixed upstream:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106102
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104799

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 10 insertions, 128 deletions

diff --git a/12.1.0/musl/50_all_calloc_libgccjit.patch b/12.1.0/musl/50_all_calloc_libgccjit.patch
deleted file mode 100644
index 78c7f44..0000000
--- a/12.1.0/musl/50_all_calloc_libgccjit.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://git.alpinelinux.org/aports/plain/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
-https://bugs.gentoo.org/828580
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104799 (additional two hunks thrown in from here for 12)
-
-From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001
-From: Alex McGrath <amk@amk.ie>
-Date: Wed, 13 Oct 2021 23:24:27 +0100
-Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
-
-This moves usages of pthread.h to above any usage of system.h as it
-included #pragma GCC poison calloc
---- a/gcc/jit/jit-playback.cc
-+++ b/gcc/jit/jit-playback.cc
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
- #include "diagnostic.h"
- #include "stmt.h"
- 
--#include <pthread.h>
--
- #include "jit-playback.h"
- #include "jit-result.h"
- #include "jit-builtins.h"
---- a/gcc/jit/jit-recording.cc
-+++ b/gcc/jit/jit-recording.cc
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
- #include "pretty-print.h"
- #include "toplev.h"
- 
--#include <pthread.h>
--
- #include "jit-builtins.h"
- #include "jit-recording.h"
- #include "jit-playback.h"
---- a/gcc/jit/libgccjit.cc
-+++ b/gcc/jit/libgccjit.cc
-@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
- #include "timevar.h"
- #include "typed-splay-tree.h"
- #include "cppbuiltin.h"
--#include <pthread.h>
- 
- #include "libgccjit.h"
- #include "jit-recording.h"
---- a/libcc1/libcc1plugin.cc
-+++ b/libcc1/libcc1plugin.cc
-@@ -17,6 +17,7 @@
-    along with GCC; see the file COPYING3.  If not see
-    <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
- #include <cc1plugin-config.h>
- 
- #undef PACKAGE_NAME
---- a/libcc1/libcp1plugin.cc
-+++ b/libcc1/libcp1plugin.cc
-@@ -18,6 +18,7 @@
-    along with GCC; see the file COPYING3.  If not see
-    <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
- #include <cc1plugin-config.h>
- 
- #undef PACKAGE_NAME
-
---- a/gcc/cp/mapper-client.cc
-+++ b/gcc/cp/mapper-client.cc
-@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.  If not see
- #define INCLUDE_STRING
- #define INCLUDE_VECTOR
- #define INCLUDE_MAP
-+#include <pthread.h>
- #include "system.h"
- 
- #include "line-map.h"
---- a/gcc/cp/module.cc
-+++ b/gcc/cp/module.cc
-@@ -204,6 +204,7 @@ Classes used:
- #include "config.h"
- #define INCLUDE_STRING
- #define INCLUDE_VECTOR
-+#include <pthread.h>
- #include "system.h"
- #include "coretypes.h"
- #include "cp-tree.h"
---- a/gcc/cp/mapper-resolver.cc
-+++ b/gcc/cp/mapper-resolver.cc
-@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  If not see
- #define INCLUDE_VECTOR
- #define INCLUDE_ALGORITHM
- #define INCLUDE_MAP
-+#include <pthread.h>
- #include "system.h"
- 
- // We don't want or need to be aware of networking
diff --git a/12.1.0/musl/README.history b/12.1.0/musl/README.history
index 37283bd..a8e921d 100644
--- a/12.1.0/musl/README.history
+++ b/12.1.0/musl/README.history
@@ -1,21 +1,23 @@
+6		03 Jul 2022
+	- 50_all_calloc_libgccjit.patch
+
+5		?? ??? ???
+	? ????
+
 4		26 Jun 2022
 	U 50_all_calloc_libgccjit.patch
 
 3               25 Apr 2022
 
-	- 25_all_multilib_pure64.patch
-	- 50_all_posix_memalign.patch
 	U 50_all_calloc_libgccjit.patch
-	- 50_all_cpu_indicator.patch
-	- nocross/50_all_libssp_unconditionally.patch
 
 2		25 Apr 2022
 
-        - 25_all_multilib_pure64.patch
-        - 50_all_posix_memalign.patch
+          25_all_multilib_pure64.patch
+          50_all_posix_memalign.patch
         U 50_all_calloc_libgccjit.patch
-        - 50_all_cpu_indicator.patch
-	- nocross/50_all_libssp_unconditionally.patch
+          50_all_cpu_indicator.patch
+	  nocross/50_all_libssp_unconditionally.patch
 
 1		25 Apr 2022