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

["Sam James" <sam@gentoo.org>]

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