From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1698657-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 B3B73158232
	for <garchives@archives.gentoo.org>; Tue, 10 Dec 2024 05:19:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C99D1E0BD3;
	Tue, 10 Dec 2024 05:19:25 +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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 95FAAE0BD3
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 05:19:24 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 91CC23430E4
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 05:19:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C304AED
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 05:19:22 +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: <1733807956.95a0fb3364df529328991a746a47ea9bd3ef4e23.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/26_all_enable-cet.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: 95a0fb3364df529328991a746a47ea9bd3ef4e23
X-VCS-Branch: master
Date: Tue, 10 Dec 2024 05:19:22 +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: fd5c5b50-44e2-477b-a426-40cc9441e710
X-Archives-Hash: 5b5b832a2349f22ab9b3cb7af29951b0

commit:     95a0fb3364df529328991a746a47ea9bd3ef4e23
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 05:18:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 05:19:16 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=95a0fb33

15.0.0: update -fcf-protection patch for offload

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

 15.0.0/gentoo/26_all_enable-cet.patch | 2 +-
 15.0.0/gentoo/README.history          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/15.0.0/gentoo/26_all_enable-cet.patch b/15.0.0/gentoo/26_all_enable-cet.patch
index be772d0..6d977cf 100644
--- a/15.0.0/gentoo/26_all_enable-cet.patch
+++ b/15.0.0/gentoo/26_all_enable-cet.patch
@@ -67,7 +67,7 @@ Only supported on amd64.
 +
 +   We use a new option (EXTRA_OPTIONS_CF) here to avoid turning
 +   this on accidentally for other arches. */
-+#ifdef EXTRA_OPTIONS_CF
++#if defined(EXTRA_OPTIONS_CF) && !defined(ACCEL_COMPILER)
 +#define DEFAULT_FLAG_CF_SPEC " %{!m16:%{!m32:%{!fcf-protection*:%{!fno-cf-protection:-fcf-protection}}}} -foffload-options=-fcf-protection=none"
 +#endif
 +#ifndef DEFAULT_FLAG_CF_SPEC

diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history
index 63fd877..639981b 100644
--- a/15.0.0/gentoo/README.history
+++ b/15.0.0/gentoo/README.history
@@ -1,6 +1,7 @@
 31	???
 
 	U 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
+	U 26_all_enable-cet.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