commit: 8883d5d098f3a0b981b04f455748bf13acfc1d32 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 10 05:24:33 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 10 05:24:33 2024 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8883d5d0
14.2.0: update patches for nvptx/accel Bug: https://bugs.gentoo.org/945296 Signed-off-by: Sam James <sam <AT> gentoo.org> 14.2.0/gentoo/04_all_nossp-on-nostdlib.patch | 5 +++-- 14.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch | 2 +- 14.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch | 2 +- 14.2.0/gentoo/26_all_enable-cet.patch | 4 ++-- 14.2.0/gentoo/README.history | 7 +++++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/14.2.0/gentoo/04_all_nossp-on-nostdlib.patch b/14.2.0/gentoo/04_all_nossp-on-nostdlib.patch index 30c5825..4462c0e 100644 --- a/14.2.0/gentoo/04_all_nossp-on-nostdlib.patch +++ b/14.2.0/gentoo/04_all_nossp-on-nostdlib.patch @@ -1,4 +1,5 @@ -│Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding +Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding + https://bugs.gentoo.org/484714 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -7,7 +8,7 @@ https://bugs.gentoo.org/484714 #endif +#ifdef ENABLE_DEFAULT_SSP -+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} " ++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} -foffload-options=-fno-stack-protector " +#else +#define NO_SSP_SPEC "" +#endif diff --git a/14.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch b/14.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch index 2daf73b..8e9e19b 100644 --- a/14.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch +++ b/14.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/876895 cpp_define (pfile, "__cpp_rtti=199711L"); } -+ #ifdef DEF_GENTOO_GLIBCXX_ASSERTIONS ++ #if defined(DEF_GENTOO_GLIBCXX_ASSERTIONS) && !defined(ACCEL_COMPILER) + cpp_define (pfile, "_GLIBCXX_ASSERTIONS"); + #endif + diff --git a/14.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch b/14.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch index b13215d..b2cc852 100644 --- a/14.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch +++ b/14.2.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/14.2.0/gentoo/26_all_enable-cet.patch b/14.2.0/gentoo/26_all_enable-cet.patch index b9bbbf0..98a22a0 100644 --- a/14.2.0/gentoo/26_all_enable-cet.patch +++ b/14.2.0/gentoo/26_all_enable-cet.patch @@ -67,8 +67,8 @@ 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 -+#define DEFAULT_FLAG_CF_SPEC " %{!m16:%{!m32:%{!fcf-protection*:%{!fno-cf-protection:-fcf-protection}}}}" ++#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 +#define DEFAULT_FLAG_CF_SPEC "" diff --git a/14.2.0/gentoo/README.history b/14.2.0/gentoo/README.history index c80977a..fc47e5b 100644 --- a/14.2.0/gentoo/README.history +++ b/14.2.0/gentoo/README.history @@ -1,3 +1,10 @@ +6 ???? + + U 04_all_nossp-on-nostdlib.patch + U 15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch + U 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch + U 26_all_enable-cet.patch + 5 1 Dec 2024 - 77_all_m2_docs_sandbox.patch
