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

Reply via email to