From 601d5f275212eb60b4265a7693f47b4446ee55f4 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Sat, 7 May 2022 20:52:09 +0200
Subject: gcc: add new package at 12.1.0 [TESTING]

---
 testing/gcc/patches/musl-libssp.patch              | 20 +++++++++++++++++
 .../gcc/patches/musl-sched_h-calloc-poison.patch   | 26 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 testing/gcc/patches/musl-libssp.patch
 create mode 100644 testing/gcc/patches/musl-sched_h-calloc-poison.patch

(limited to 'testing/gcc/patches')

diff --git a/testing/gcc/patches/musl-libssp.patch b/testing/gcc/patches/musl-libssp.patch
new file mode 100644
index 00000000..fe5c6143
--- /dev/null
+++ b/testing/gcc/patches/musl-libssp.patch
@@ -0,0 +1,20 @@
+Author: Timo Teräs <timo.teras@iki.fi>
+
+Alpine musl package provides libssp_nonshared.a. We link to it unconditionally,
+as otherwise we get link failures if some objects are -fstack-protector built
+and final link happens with -fno-stack-protector. This seems to be the common
+case when bootstrapping gcc, the piepatches do not seem to fully fix the
+crosstoolchain and  bootstrap sequence wrt. stack-protector flag usage.
+
+--- gcc-6.1.0/gcc/gcc.c.orig
++++ gcc-6.1.0/gcc/gcc.c
+@@ -870,8 +870,7 @@
+ 
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+-		       "|fstack-protector-strong|fstack-protector-explicit:}"
++#define LINK_SSP_SPEC "-lssp_nonshared"
+ #else
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+ 		       "|fstack-protector-strong|fstack-protector-explicit" \
diff --git a/testing/gcc/patches/musl-sched_h-calloc-poison.patch b/testing/gcc/patches/musl-sched_h-calloc-poison.patch
new file mode 100644
index 00000000..e5621106
--- /dev/null
+++ b/testing/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"
-- 
cgit v1.2.3