commit:     e5cf99cfba2cb9de2d80a2823220b256445d033d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 00:51:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 01:12:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e5cf99cf

12.0.0: add musl calloc patch

Bug: https://bugs.gentoo.org/828580
Signed-off-by: Sam James <sam <AT> gentoo.org>

 12.0.0/musl/50_all_calloc_libgccjit.patch | 68 +++++++++++++++++++++++++++++++
 12.0.0/musl/README.history                | 14 +++++++
 2 files changed, 82 insertions(+)

diff --git a/12.0.0/musl/50_all_calloc_libgccjit.patch 
b/12.0.0/musl/50_all_calloc_libgccjit.patch
new file mode 100644
index 0000000..756f622
--- /dev/null
+++ b/12.0.0/musl/50_all_calloc_libgccjit.patch
@@ -0,0 +1,68 @@
+https://git.alpinelinux.org/aports/plain/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+https://bugs.gentoo.org/828580
+
+From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001
+From: Alex McGrath <[email protected]>
+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.c
++++ b/gcc/jit/jit-playback.c
+@@ -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.c
++++ b/gcc/jit/jit-recording.c
+@@ -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.c
++++ b/gcc/jit/libgccjit.c
+@@ -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"

diff --git a/12.0.0/musl/README.history b/12.0.0/musl/README.history
new file mode 100644
index 0000000..bbddd5d
--- /dev/null
+++ b/12.0.0/musl/README.history
@@ -0,0 +1,14 @@
+2              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
+
+1              25 Apr 2022
+
+       + 25_all_multilib_pure64.patch
+       + 50_all_posix_memalign.patch
+       + 50_all_cpu_indicator.patch
+       + nocross/50_all_libssp_unconditionally.patch

Reply via email to