diff options
| author |   Sam James <sam@gentoo.org> | 2022-12-28 17:54:22 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-12-28 17:54:22 +0000 |
| commit | 224f6241ec785ccc386eb191df36d919e9b62351 (patch) | |
| tree | 4da03abcfdf920455f62d8bc8ae3f0e244792fb8 /12.2.0 | |
| parent | 12.2.0: drop upstreamed make 4.4 patches (diff) | |
| download | gcc-patches-224f6241ec785ccc386eb191df36d919e9b62351.tar.gz gcc-patches-224f6241ec785ccc386eb191df36d919e9b62351.tar.bz2 gcc-patches-224f6241ec785ccc386eb191df36d919e9b62351.zip | |
12.2.0: add patches for FORTIFY_SOURCE=3, default GLIBCXX_ASSERTIONS
Bug: https://bugs.gentoo.org/876895
Bug: https://bugs.gentoo.org/884417
Bug: https://bugs.gentoo.org/847148
Bug: https://bugs.gentoo.org/876893
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '12.2.0')
| -rw-r--r-- | 12.2.0/gentoo/01_all_default-fortify-source.patch | 8 | ||||
| -rw-r--r-- | 12.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch | 14 | ||||
| -rw-r--r-- | 12.2.0/gentoo/README.history | 4 |
3 files changed, 24 insertions, 2 deletions
diff --git a/12.2.0/gentoo/01_all_default-fortify-source.patch b/12.2.0/gentoo/01_all_default-fortify-source.patch index d9f001a..79d6639 100644 --- a/12.2.0/gentoo/01_all_default-fortify-source.patch +++ b/12.2.0/gentoo/01_all_default-fortify-source.patch @@ -7,14 +7,18 @@ initially Gentoo used too complicated macro. # DP: if the optimization level is > 0 --- a/gcc/c-family/c-cppbuiltin.cc +++ b/gcc/c-family/c-cppbuiltin.cc -@@ -1510,6 +1510,12 @@ c_cpp_builtins (cpp_reader *pfile) +@@ -1510,6 +1510,16 @@ c_cpp_builtins (cpp_reader *pfile) builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0); builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0); +#if !defined(ACCEL_COMPILER) ++ #ifndef GENTOO_FORTIFY_SOURCE_LEVEL ++ #define GENTOO_FORTIFY_SOURCE_LEVEL 2 ++ #endif ++ + /* Fortify Source enabled by default for optimization levels > 0 */ + if (optimize) -+ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2); ++ builtin_define_with_int_value ("_FORTIFY_SOURCE", GENTOO_FORTIFY_SOURCE_LEVEL); +#endif + /* Misc. */ diff --git a/12.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch b/12.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch new file mode 100644 index 0000000..2daf73b --- /dev/null +++ b/12.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/876895 +--- a/gcc/c-family/c-cppbuiltin.cc ++++ b/gcc/c-family/c-cppbuiltin.cc +@@ -957,6 +957,10 @@ c_cpp_builtins (cpp_reader *pfile) + cpp_define (pfile, "__cpp_rtti=199711L"); + } + ++ #ifdef DEF_GENTOO_GLIBCXX_ASSERTIONS ++ cpp_define (pfile, "_GLIBCXX_ASSERTIONS"); ++ #endif ++ + if (cxx_dialect >= cxx11) + cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__"); + diff --git a/12.2.0/gentoo/README.history b/12.2.0/gentoo/README.history index 29fd78e..713d788 100644 --- a/12.2.0/gentoo/README.history +++ b/12.2.0/gentoo/README.history @@ -1,3 +1,7 @@ +8 28 Dec 2022 + U 01_all_default-fortify-source.patch + + 15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch + 7 25 Dec 2022 - 78_all_Factor-out-jobserver_active_p.patch - 79_all_lto-support-jobserver-style-fifo-for-recent-GNU-make.patch |