commit: 8ffd428773f8e1e6af99fcf1aa58d4339b761a9c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 00:17:32 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 00:17:32 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8ffd4287
12.2.0: Move -z now and -fstack-clash-protection out of EXTRA_OPTIONS
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...EXTRA_OPTIONS-z-now.patch => 23_all_DEF_GENTOO_ZNOW-z-now.patch} | 4 ++--
...on.patch => 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch} | 4 ++--
12.2.0/gentoo/README.history | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/12.2.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
b/12.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
similarity index 91%
rename from 12.2.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
rename to 12.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
index 8874b32..2ed7968 100644
--- a/12.2.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
+++ b/12.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
@@ -1,4 +1,4 @@
-On Hardened we add some options like -z now
+If requested we add -z now
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -6,7 +6,7 @@ On Hardened we add some options like -z now
#endif
#endif
-+#ifdef EXTRA_OPTIONS
++#ifdef DEF_GENTOO_ZNOW
+#define LINK_NOW_SPEC "%{!nonow:-z now} "
+#else
+#define LINK_NOW_SPEC ""
diff --git a/12.2.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
b/12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
similarity index 96%
rename from 12.2.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
rename to 12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
index e1b3c54..1ed716b 100644
--- a/12.2.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
@@ -1,4 +1,4 @@
-On Hardened we add some options like -fstack-clash-protection.
+We add -fstack-clash-protection if requested
--- a/gcc/common.opt
+++ a/gcc/common.opt
@@ -19,7 +19,7 @@ On Hardened we add some options like -fstack-clash-protection.
+/* Default value for flag_clash_protector when flag_clash_protector is
+ initialized to -1. */
-+#ifdef EXTRA_OPTIONS
++#ifdef DEF_GENTOO_SCP
+#define DEFAULT_FLAG_SCP 1
+#endif
+#ifndef DEFAULT_FLAG_SCP
diff --git a/12.2.0/gentoo/README.history b/12.2.0/gentoo/README.history
index c3b2413..a78f0e3 100644
--- a/12.2.0/gentoo/README.history
+++ b/12.2.0/gentoo/README.history
@@ -1,3 +1,9 @@
+ - 23_all_EXTRA_OPTIONS-z-now.patch
+ + 23_all_DEF_GENTOO_ZNOW-z-now.patch
+ - 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+ + 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
+
+
2 19 Nov 2022
+ 76_all_libsanitizer-implicit-function-decls.patch
+ 77_all_libiberty-fix-c89-isms-in-configure.patch
