commit: 038fd4e08bbf78fabe2d8bb13aec85bd20a611b1 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Mar 14 10:46:40 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Mar 14 10:46:40 2020 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=038fd4e0
9.3.0: split 04_all_default-ssp-fix.patch in two No functional change should happen. gcc-10 got rid of defaults defined in .c file. We'll need to adapt one patch slightly. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> ...efault-ssp-fix.patch => 04_all_nossp-on-nostdlib.patch} | 13 +------------ 9.3.0/gentoo/27_all_default_ssp-buffer-size.patch | 14 ++++++++++++++ 9.3.0/gentoo/README.history | 5 +++++ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/9.3.0/gentoo/04_all_default-ssp-fix.patch b/9.3.0/gentoo/04_all_nossp-on-nostdlib.patch similarity index 67% rename from 9.3.0/gentoo/04_all_default-ssp-fix.patch rename to 9.3.0/gentoo/04_all_nossp-on-nostdlib.patch index d2deac7..648d712 100644 --- a/9.3.0/gentoo/04_all_default-ssp-fix.patch +++ b/9.3.0/gentoo/04_all_nossp-on-nostdlib.patch @@ -1,6 +1,6 @@ Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding -Change the buffer size. +https://bugs.gentoo.org/484714 --- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200 +++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100 @@ -857,6 +857,12 @@ proper position among the other output f @@ -25,14 +25,3 @@ Change the buffer size. %{coverage:-fprofile-arcs -ftest-coverage}\ %{fprofile-arcs|fprofile-generate*|coverage:\ %{!fprofile-update=singel:\ ---- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200 -+++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200 -@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT, - DEFPARAM (PARAM_SSP_BUFFER_SIZE, - "ssp-buffer-size", - "The lower bound for a buffer to be considered for stack smashing protection.", -- 8, 1, 0) -+ 4, 1, 0) - - DEFPARAM (PARAM_MIN_SIZE_FOR_STACK_SHARING, - "min-size-for-stack-sharing", diff --git a/9.3.0/gentoo/27_all_default_ssp-buffer-size.patch b/9.3.0/gentoo/27_all_default_ssp-buffer-size.patch new file mode 100644 index 0000000..dddd06b --- /dev/null +++ b/9.3.0/gentoo/27_all_default_ssp-buffer-size.patch @@ -0,0 +1,14 @@ +Change the minimal SSP buffer size. + +https://bugs.gentoo.org/484714 +--- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200 ++++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200 +@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT, + DEFPARAM (PARAM_SSP_BUFFER_SIZE, + "ssp-buffer-size", + "The lower bound for a buffer to be considered for stack smashing protection.", +- 8, 1, 0) ++ 4, 1, 0) + + DEFPARAM (PARAM_MIN_SIZE_FOR_STACK_SHARING, + "min-size-for-stack-sharing", diff --git a/9.3.0/gentoo/README.history b/9.3.0/gentoo/README.history index 6f2d71a..e5865d4 100644 --- a/9.3.0/gentoo/README.history +++ b/9.3.0/gentoo/README.history @@ -1,3 +1,8 @@ +2 TODO + - 04_all_default-ssp-fix.patch + + 04_all_nossp-on-nostdlib.patch + + 27_all_default_ssp-buffer-size.patch + 1 12 Mar 2019 + 01_all_default-fortify-source.patch + 02_all_default-warn-format-security.patch
