* [gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/
@ 2022-04-25 1:12 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-25 1:12 UTC (permalink / raw
To: gentoo-commits
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 <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"
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/
@ 2022-04-25 1:12 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-25 1:12 UTC (permalink / raw
To: gentoo-commits
commit: e1b2fe74f2926ecc663804531227937a90315a80
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 01:10:06 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=e1b2fe74
12.0.0: update calloc patch (again)
Bug: https://bugs.gentoo.org/828580
Signed-off-by: Sam James <sam <AT> gentoo.org>
12.0.0/musl/50_all_calloc_libgccjit.patch | 12 ++++++------
12.0.0/musl/README.history | 8 ++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/12.0.0/musl/50_all_calloc_libgccjit.patch b/12.0.0/musl/50_all_calloc_libgccjit.patch
index 756f622..f50ef8f 100644
--- a/12.0.0/musl/50_all_calloc_libgccjit.patch
+++ b/12.0.0/musl/50_all_calloc_libgccjit.patch
@@ -8,8 +8,8 @@ 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
+--- 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/>. */
@@ -28,8 +28,8 @@ included #pragma GCC poison calloc
#include "jit-playback.h"
#include "jit-result.h"
#include "jit-builtins.h"
---- a/gcc/jit/jit-recording.c
-+++ b/gcc/jit/jit-recording.c
+--- 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/>. */
@@ -48,8 +48,8 @@ included #pragma GCC poison calloc
#include "jit-builtins.h"
#include "jit-recording.h"
#include "jit-playback.h"
---- a/gcc/jit/libgccjit.c
-+++ b/gcc/jit/libgccjit.c
+--- 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/>. */
diff --git a/12.0.0/musl/README.history b/12.0.0/musl/README.history
index bbddd5d..01e2278 100644
--- a/12.0.0/musl/README.history
+++ b/12.0.0/musl/README.history
@@ -1,3 +1,11 @@
+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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/
@ 2022-04-25 2:41 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-25 2:41 UTC (permalink / raw
To: gentoo-commits
commit: e0567416b1eb9ca23636be56d9b017e671881269
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 02:35:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 02:35:02 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e0567416
12.0.0: update calloc patch (again again)
Bug: https://bugs.gentoo.org/828580
Signed-off-by: Sam James <sam <AT> gentoo.org>
12.0.0/musl/50_all_calloc_libgccjit.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/12.0.0/musl/50_all_calloc_libgccjit.patch b/12.0.0/musl/50_all_calloc_libgccjit.patch
index f50ef8f..876f186 100644
--- a/12.0.0/musl/50_all_calloc_libgccjit.patch
+++ b/12.0.0/musl/50_all_calloc_libgccjit.patch
@@ -1,5 +1,6 @@
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>
@@ -66,3 +67,24 @@ 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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-25 2:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-25 1:12 [gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-04-25 1:12 Sam James
2022-04-25 2:41 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox