| 1 |
commit: 7c24ad73deb1a00f606e8dce7de0ae1a3984f54e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 00:21:52 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 00:57:03 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=7c24ad73 |
| 7 |
|
| 8 |
12.1.0: musl: drop 50_all_calloc_libgccjit.patch |
| 9 |
|
| 10 |
Fixed upstream: |
| 11 |
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106102 |
| 12 |
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104799 |
| 13 |
|
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
12.1.0/musl/50_all_calloc_libgccjit.patch | 120 ------------------------------ |
| 17 |
12.1.0/musl/README.history | 18 +++-- |
| 18 |
2 files changed, 10 insertions(+), 128 deletions(-) |
| 19 |
|
| 20 |
diff --git a/12.1.0/musl/50_all_calloc_libgccjit.patch b/12.1.0/musl/50_all_calloc_libgccjit.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index 78c7f44..0000000 |
| 23 |
--- a/12.1.0/musl/50_all_calloc_libgccjit.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,120 +0,0 @@ |
| 26 |
-https://git.alpinelinux.org/aports/plain/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch |
| 27 |
-https://bugs.gentoo.org/828580 |
| 28 |
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104799 (additional two hunks thrown in from here for 12) |
| 29 |
- |
| 30 |
-From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001 |
| 31 |
-From: Alex McGrath <amk@×××.ie> |
| 32 |
-Date: Wed, 13 Oct 2021 23:24:27 +0100 |
| 33 |
-Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit |
| 34 |
- |
| 35 |
-This moves usages of pthread.h to above any usage of system.h as it |
| 36 |
-included #pragma GCC poison calloc |
| 37 |
---- a/gcc/jit/jit-playback.cc |
| 38 |
-+++ b/gcc/jit/jit-playback.cc |
| 39 |
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License |
| 40 |
- along with GCC; see the file COPYING3. If not see |
| 41 |
- <http://www.gnu.org/licenses/>. */ |
| 42 |
- |
| 43 |
-+#include <pthread.h> |
| 44 |
-+ |
| 45 |
- #include "config.h" |
| 46 |
- #include "system.h" |
| 47 |
- #include "coretypes.h" |
| 48 |
-@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3. If not see |
| 49 |
- #include "diagnostic.h" |
| 50 |
- #include "stmt.h" |
| 51 |
- |
| 52 |
--#include <pthread.h> |
| 53 |
-- |
| 54 |
- #include "jit-playback.h" |
| 55 |
- #include "jit-result.h" |
| 56 |
- #include "jit-builtins.h" |
| 57 |
---- a/gcc/jit/jit-recording.cc |
| 58 |
-+++ b/gcc/jit/jit-recording.cc |
| 59 |
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License |
| 60 |
- along with GCC; see the file COPYING3. If not see |
| 61 |
- <http://www.gnu.org/licenses/>. */ |
| 62 |
- |
| 63 |
-+#include <pthread.h> |
| 64 |
-+ |
| 65 |
- #include "config.h" |
| 66 |
- #include "system.h" |
| 67 |
- #include "coretypes.h" |
| 68 |
-@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3. If not see |
| 69 |
- #include "pretty-print.h" |
| 70 |
- #include "toplev.h" |
| 71 |
- |
| 72 |
--#include <pthread.h> |
| 73 |
-- |
| 74 |
- #include "jit-builtins.h" |
| 75 |
- #include "jit-recording.h" |
| 76 |
- #include "jit-playback.h" |
| 77 |
---- a/gcc/jit/libgccjit.cc |
| 78 |
-+++ b/gcc/jit/libgccjit.cc |
| 79 |
-@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License |
| 80 |
- along with GCC; see the file COPYING3. If not see |
| 81 |
- <http://www.gnu.org/licenses/>. */ |
| 82 |
- |
| 83 |
-+#include <pthread.h> |
| 84 |
-+ |
| 85 |
- #include "config.h" |
| 86 |
- #include "system.h" |
| 87 |
- #include "coretypes.h" |
| 88 |
- #include "timevar.h" |
| 89 |
- #include "typed-splay-tree.h" |
| 90 |
- #include "cppbuiltin.h" |
| 91 |
--#include <pthread.h> |
| 92 |
- |
| 93 |
- #include "libgccjit.h" |
| 94 |
- #include "jit-recording.h" |
| 95 |
---- a/libcc1/libcc1plugin.cc |
| 96 |
-+++ b/libcc1/libcc1plugin.cc |
| 97 |
-@@ -17,6 +17,7 @@ |
| 98 |
- along with GCC; see the file COPYING3. If not see |
| 99 |
- <http://www.gnu.org/licenses/>. */ |
| 100 |
- |
| 101 |
-+#include <pthread.h> |
| 102 |
- #include <cc1plugin-config.h> |
| 103 |
- |
| 104 |
- #undef PACKAGE_NAME |
| 105 |
---- a/libcc1/libcp1plugin.cc |
| 106 |
-+++ b/libcc1/libcp1plugin.cc |
| 107 |
-@@ -18,6 +18,7 @@ |
| 108 |
- along with GCC; see the file COPYING3. If not see |
| 109 |
- <http://www.gnu.org/licenses/>. */ |
| 110 |
- |
| 111 |
-+#include <pthread.h> |
| 112 |
- #include <cc1plugin-config.h> |
| 113 |
- |
| 114 |
- #undef PACKAGE_NAME |
| 115 |
- |
| 116 |
---- a/gcc/cp/mapper-client.cc |
| 117 |
-+++ b/gcc/cp/mapper-client.cc |
| 118 |
-@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see |
| 119 |
- #define INCLUDE_STRING |
| 120 |
- #define INCLUDE_VECTOR |
| 121 |
- #define INCLUDE_MAP |
| 122 |
-+#include <pthread.h> |
| 123 |
- #include "system.h" |
| 124 |
- |
| 125 |
- #include "line-map.h" |
| 126 |
---- a/gcc/cp/module.cc |
| 127 |
-+++ b/gcc/cp/module.cc |
| 128 |
-@@ -204,6 +204,7 @@ Classes used: |
| 129 |
- #include "config.h" |
| 130 |
- #define INCLUDE_STRING |
| 131 |
- #define INCLUDE_VECTOR |
| 132 |
-+#include <pthread.h> |
| 133 |
- #include "system.h" |
| 134 |
- #include "coretypes.h" |
| 135 |
- #include "cp-tree.h" |
| 136 |
---- a/gcc/cp/mapper-resolver.cc |
| 137 |
-+++ b/gcc/cp/mapper-resolver.cc |
| 138 |
-@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see |
| 139 |
- #define INCLUDE_VECTOR |
| 140 |
- #define INCLUDE_ALGORITHM |
| 141 |
- #define INCLUDE_MAP |
| 142 |
-+#include <pthread.h> |
| 143 |
- #include "system.h" |
| 144 |
- |
| 145 |
- // We don't want or need to be aware of networking |
| 146 |
|
| 147 |
diff --git a/12.1.0/musl/README.history b/12.1.0/musl/README.history |
| 148 |
index 37283bd..a8e921d 100644 |
| 149 |
--- a/12.1.0/musl/README.history |
| 150 |
+++ b/12.1.0/musl/README.history |
| 151 |
@@ -1,21 +1,23 @@ |
| 152 |
+6 03 Jul 2022 |
| 153 |
+ - 50_all_calloc_libgccjit.patch |
| 154 |
+ |
| 155 |
+5 ?? ??? ??? |
| 156 |
+ ? ???? |
| 157 |
+ |
| 158 |
4 26 Jun 2022 |
| 159 |
U 50_all_calloc_libgccjit.patch |
| 160 |
|
| 161 |
3 25 Apr 2022 |
| 162 |
|
| 163 |
- - 25_all_multilib_pure64.patch |
| 164 |
- - 50_all_posix_memalign.patch |
| 165 |
U 50_all_calloc_libgccjit.patch |
| 166 |
- - 50_all_cpu_indicator.patch |
| 167 |
- - nocross/50_all_libssp_unconditionally.patch |
| 168 |
|
| 169 |
2 25 Apr 2022 |
| 170 |
|
| 171 |
- - 25_all_multilib_pure64.patch |
| 172 |
- - 50_all_posix_memalign.patch |
| 173 |
+ 25_all_multilib_pure64.patch |
| 174 |
+ 50_all_posix_memalign.patch |
| 175 |
U 50_all_calloc_libgccjit.patch |
| 176 |
- - 50_all_cpu_indicator.patch |
| 177 |
- - nocross/50_all_libssp_unconditionally.patch |
| 178 |
+ 50_all_cpu_indicator.patch |
| 179 |
+ nocross/50_all_libssp_unconditionally.patch |
| 180 |
|
| 181 |
1 25 Apr 2022 |
Archives