From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1698655-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 700AA158232
	for <garchives@archives.gentoo.org>; Tue, 10 Dec 2024 05:11:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7AEFEE0BF1;
	Tue, 10 Dec 2024 05:11:50 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id C4186E0BF1
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 05:11:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id B48583430E5
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 05:11:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 21462AED
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 05:11:47 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1733807477.f41e17d0b106cc664c051f599c09ce696a3ab66d.sam@gentoo>
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 15.0.0/gentoo/
X-VCS-Repository: proj/gcc-patches
X-VCS-Files: 15.0.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch 15.0.0/gentoo/README.history
X-VCS-Directories: 15.0.0/gentoo/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: f41e17d0b106cc664c051f599c09ce696a3ab66d
X-VCS-Branch: master
Date: Tue, 10 Dec 2024 05:11:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9d52e001-e7dd-497a-b40d-bf9834f2b8fb
X-Archives-Hash: 886aef07d96f8ebe4e0de31e512b7bca

commit:     f41e17d0b106cc664c051f599c09ce696a3ab66d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 05:11:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 05:11:17 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f41e17d0

15.0.0: update -fstack-clash-protection patch for offload

Bug: https://bugs.gentoo.org/945296
Signed-off-by: Sam James <sam <AT> gentoo.org>

 15.0.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch | 2 +-
 15.0.0/gentoo/README.history                                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/15.0.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch b/15.0.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
index b13215d..b2cc852 100644
--- a/15.0.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
+++ b/15.0.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
@@ -19,7 +19,7 @@ We add -fstack-clash-protection if requested
  
 +/* Default value for flag_clash_protector when flag_clash_protector is
 +   initialized to -1.  */
-+#ifdef DEF_GENTOO_SCP
++#if defined(DEF_GENTOO_SCP) && !defined(ACCEL_COMPILER)
 +#define DEFAULT_FLAG_SCP 1
 +#endif
 +#ifndef DEFAULT_FLAG_SCP

diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history
index adc1fef..63fd877 100644
--- a/15.0.0/gentoo/README.history
+++ b/15.0.0/gentoo/README.history
@@ -1,5 +1,6 @@
 31	???
 
+	U 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
 	+ 74_all_PR117724-Fix-type-compatibility-for-types-with-flexible-array.patch
 	+ 75_all_PR117724-testsuite-fix-LTO-flags-in-pr112716.c.patch
 	+ 76_all_PR117854-config-nvptx-fix-bashisms-with-gen-copyright.sh-use.patch