commit: 688be5587b9259bbd1bd64be6da4ebdb14f31299
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 22:36:06 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 22:36:06 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=688be558
13.1.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 ++--
...ion.patch => 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch} | 4 ++--
13.1.0/gentoo/README.history | 5 +++++
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
b/13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
similarity index 91%
rename from 13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
rename to 13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
index 8874b32..2ed7968 100644
--- a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
+++ b/13.1.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/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
b/13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
similarity index 96%
rename from 13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
rename to 13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
index e1b3c54..1ed716b 100644
--- a/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/13.1.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/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 6c79f5f..3d797d2 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,8 @@
+ - 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 8 November 2022
- 12_all_disable-systemtap-switch.patch
