[gentoo-commits] proj/gcc-patches:master commit in: 11.4.0/musl/

[gentoo-commits] proj/gcc-patches:master commit in: 11.4.0/musl/

[Sam James]

commit:     c6e054b9a653edf7d5f6e94ded6c3887c2f1ec60
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 01:03:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 01:03:04 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=c6e054b9

11.4.0: update calloc/musl patch

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

 11.4.0/musl/50_all_calloc_libgccjit.patch | 50 +++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/11.4.0/musl/50_all_calloc_libgccjit.patch b/11.4.0/musl/50_all_calloc_libgccjit.patch
index 5dec538..bbb6787 100644
--- a/11.4.0/musl/50_all_calloc_libgccjit.patch
+++ b/11.4.0/musl/50_all_calloc_libgccjit.patch
@@ -12,6 +12,36 @@ 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/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/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
+--- 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/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
@@ -70,3 +100,23 @@ included #pragma GCC poison calloc
  
  #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

[gentoo-commits] proj/gcc-patches:master commit in: 11.4.0/musl/

[Sam James]

commit:     db34375a2a99b865f51349eba2c8c0293f12b953
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 08:59:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 09:00:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=db34375a

11.4.0: add 50_all_calloc_libgccjit

I could've sworn we added this for 11.x too,
but apparently I never did for 12.x.

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

 11.4.0/musl/50_all_calloc_libgccjit.patch | 72 +++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/11.4.0/musl/50_all_calloc_libgccjit.patch b/11.4.0/musl/50_all_calloc_libgccjit.patch
new file mode 100644
index 0000000..5dec538
--- /dev/null
+++ b/11.4.0/musl/50_all_calloc_libgccjit.patch
@@ -0,0 +1,72 @@
+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://bugs.gentoo.org/851555
+
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106102
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104799
+
+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.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"