From 092486db4b0eb9b6a4b580e5abb0419d176cb864 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 May 2022 23:51:35 +0200
Subject: gcc: bump to 12.1.0 [TESTING -> CORE]

---
 core/gcc/build                                    |  3 ++-
 core/gcc/checksums                                |  3 ++-
 core/gcc/patches/musl-sched_h-calloc-poison.patch | 26 +++++++++++++++++++++++
 core/gcc/sources                                  |  3 ++-
 core/gcc/version                                  |  2 +-
 5 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 core/gcc/patches/musl-sched_h-calloc-poison.patch

(limited to 'core')

diff --git a/core/gcc/build b/core/gcc/build
index 9b62feed..e4b826ab 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -12,8 +12,9 @@ if [ "${sys_arch#i*86}" ]; then
     clsed 's/lib64/lib/'       gcc/gcc/config/i386/linux64.h
 else
     # Apply libssp patch for i686.
-    (cd gcc; patch -Np1 < ../musl-libssp.patch)
+    patch -d gcc -p1 < musl-libssp.patch
 fi
+patch -d gcc -p1 < musl-sched_h-calloc-poison.patch
 
 case "$sys_arch" in
     i*86)   archopts="--build=i686-pc-linux-musl \
diff --git a/core/gcc/checksums b/core/gcc/checksums
index 53198395..a2961d42 100644
--- a/core/gcc/checksums
+++ b/core/gcc/checksums
@@ -1,7 +1,8 @@
 %BLAKE3
-4a5c444fb45b043cfa4ebfd6cb18069135b15968652a3b8ff412434896085099  gcc-11.3.0.tar.xz
+f4031aa70a30b0d14fb8b0f331860ba4faf484494208ad7a7a9399becb9a85a2  gcc-12.1.0.tar.xz
 52cecfbbe286820d1f8bc118769008acb6451bd074fe6dea9e868d54b2ada855  gmp-6.2.1.tar.xz
 956f9b16d0377b777e21b07d27962ec1153236ef2e94039ec1ad375859c01fc9  mpfr-4.1.0.tar.xz
 f967a250c85296a88bf6a2471b74558d89a59fe548e119f6d74fccb7cb73b13e  mpc-1.2.1.tar.gz
 0930e07dc2c5bf1172f3fd003a1be7abc3c0c420ce5bd76bc2e514c63800adcb  c99
 30c25e440a4ac72bf7dc50e564b94a8c4ef43e4b2030c12d3042a78fb3cbc825  musl-libssp.patch
+495a5f94c38d940dc174e8d9cbd2bc4a9399062e579a0de0afddbec0f0c2f39c  musl-sched_h-calloc-poison.patch
diff --git a/core/gcc/patches/musl-sched_h-calloc-poison.patch b/core/gcc/patches/musl-sched_h-calloc-poison.patch
new file mode 100644
index 00000000..e5621106
--- /dev/null
+++ b/core/gcc/patches/musl-sched_h-calloc-poison.patch
@@ -0,0 +1,26 @@
+diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc
+index 12ab5a5..a2762e7 100644
+--- a/libcc1/libcc1plugin.cc
++++ b/libcc1/libcc1plugin.cc
+@@ -31,6 +31,8 @@
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ 
++#include <pthread.h>
++
+ #include "gcc-plugin.h"
+ #include "system.h"
+ #include "coretypes.h"
+diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc
+index 83dab7f..d84fa64 100644
+--- a/libcc1/libcp1plugin.cc
++++ b/libcc1/libcp1plugin.cc
+@@ -32,6 +32,8 @@
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ 
++#include <pthread.h>
++
+ #include "gcc-plugin.h"
+ #include "system.h"
+ #include "coretypes.h"
diff --git a/core/gcc/sources b/core/gcc/sources
index 0f83060c..01cd92b8 100644
--- a/core/gcc/sources
+++ b/core/gcc/sources
@@ -1,6 +1,7 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/gcc-11.3.0.tar.xz gcc
+https://gcc.gnu.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz gcc
 https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz gcc/gmp
 https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz gcc/mpfr
 https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz gcc/mpc
 files/c99
 patches/musl-libssp.patch
+patches/musl-sched_h-calloc-poison.patch
diff --git a/core/gcc/version b/core/gcc/version
index 05f4f2c2..d3f2d92e 100644
--- a/core/gcc/version
+++ b/core/gcc/version
@@ -1 +1 @@
-11.3.0 1
+12.1.0 1
-- 
cgit v1.2.3