| 1 |
commit: 688be5587b9259bbd1bd64be6da4ebdb14f31299 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 22:36:06 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 22:36:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=688be558 |
| 7 |
|
| 8 |
13.1.0: Move -z now and -fstack-clash-protection out of EXTRA_OPTIONS |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
..._EXTRA_OPTIONS-z-now.patch => 23_all_DEF_GENTOO_ZNOW-z-now.patch} | 4 ++-- |
| 13 |
...ion.patch => 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch} | 4 ++-- |
| 14 |
13.1.0/gentoo/README.history | 5 +++++ |
| 15 |
3 files changed, 9 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
similarity index 91% |
| 19 |
rename from 13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch |
| 20 |
rename to 13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch |
| 21 |
index 8874b32..2ed7968 100644 |
| 22 |
--- a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch |
| 23 |
+++ b/13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-On Hardened we add some options like -z now |
| 26 |
+If requested we add -z now |
| 27 |
|
| 28 |
--- a/gcc/gcc.cc |
| 29 |
+++ b/gcc/gcc.cc |
| 30 |
@@ -6,7 +6,7 @@ On Hardened we add some options like -z now |
| 31 |
#endif |
| 32 |
#endif |
| 33 |
|
| 34 |
-+#ifdef EXTRA_OPTIONS |
| 35 |
++#ifdef DEF_GENTOO_ZNOW |
| 36 |
+#define LINK_NOW_SPEC "%{!nonow:-z now} " |
| 37 |
+#else |
| 38 |
+#define LINK_NOW_SPEC "" |
| 39 |
|
| 40 |
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 |
| 41 |
similarity index 96% |
| 42 |
rename from 13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch |
| 43 |
rename to 13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch |
| 44 |
index e1b3c54..1ed716b 100644 |
| 45 |
--- a/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch |
| 46 |
+++ b/13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-On Hardened we add some options like -fstack-clash-protection. |
| 49 |
+We add -fstack-clash-protection if requested |
| 50 |
|
| 51 |
--- a/gcc/common.opt |
| 52 |
+++ a/gcc/common.opt |
| 53 |
@@ -19,7 +19,7 @@ On Hardened we add some options like -fstack-clash-protection. |
| 54 |
|
| 55 |
+/* Default value for flag_clash_protector when flag_clash_protector is |
| 56 |
+ initialized to -1. */ |
| 57 |
-+#ifdef EXTRA_OPTIONS |
| 58 |
++#ifdef DEF_GENTOO_SCP |
| 59 |
+#define DEFAULT_FLAG_SCP 1 |
| 60 |
+#endif |
| 61 |
+#ifndef DEFAULT_FLAG_SCP |
| 62 |
|
| 63 |
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history |
| 64 |
index 6c79f5f..3d797d2 100644 |
| 65 |
--- a/13.1.0/gentoo/README.history |
| 66 |
+++ b/13.1.0/gentoo/README.history |
| 67 |
@@ -1,3 +1,8 @@ |
| 68 |
+ - 23_all_EXTRA_OPTIONS-z-now.patch |
| 69 |
+ + 23_all_DEF_GENTOO_ZNOW-z-now.patch |
| 70 |
+ - 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch |
| 71 |
+ + 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch |
| 72 |
+ |
| 73 |
2 8 November 2022 |
| 74 |
- 12_all_disable-systemtap-switch.patch |
Archives