diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2017-05-08 20:32:41 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2017-05-08 20:32:41 +0000 |
| commit | 9a8b597560b772b44d85258229ed912ab10a8b4f (patch) | |
| tree | 2f0ab66dd58bf49c0575dff7ac7024d45ac54c77 | |
| parent | Add patchset ver 1.1 for gcc-7.1.0 (diff) | |
| download | gentoo-9a8b597560b772b44d85258229ed912ab10a8b4f.tar.gz gentoo-9a8b597560b772b44d85258229ed912ab10a8b4f.tar.bz2 gentoo-9a8b597560b772b44d85258229ed912ab10a8b4f.zip | |
Clean up this mess of a patch. Mea culpa
| -rw-r--r-- | src/patchsets/gcc/7.1.0/gentoo/13_all_default-ssp-fix.patch | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/patchsets/gcc/7.1.0/gentoo/13_all_default-ssp-fix.patch b/src/patchsets/gcc/7.1.0/gentoo/13_all_default-ssp-fix.patch index 24a92eb3fc..d5672974c5 100644 --- a/src/patchsets/gcc/7.1.0/gentoo/13_all_default-ssp-fix.patch +++ b/src/patchsets/gcc/7.1.0/gentoo/13_all_default-ssp-fix.patch @@ -18,21 +18,8 @@ and change the buffer size. case OPT_fhosted: flag_hosted = value; flag_no_builtin = !value; ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1145,6 +1145,7 @@ - %{-help=*:--help=%*}\ - %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\ - %{fsyntax-only:-o %j} %{-param*}\ -+ %{nostdlib:-nostdlib}\ - %{coverage:-fprofile-arcs -ftest-coverage}\ - %{fprofile-arcs|fprofile-generate*|coverage:\ - %{!fprofile-update=single:\ -We disable ssp on -nostdlib and -ffreestanding as we did on older gcc -and change the buffer size. - ---- a/gcc/c-family/c.opt 2016-03-23 18:51:56.000000000 +0100 -+++ b/gcc/c-family/c.opt 2016-09-18 18:46:17.071649782 +0200 +--- a/gcc/c-family/c.opt ++++ b/gcc/c-family/c.opt @@ -1647,6 +1647,10 @@ nostdinc++ C++ ObjC++ Do not search standard system include directories for C++. @@ -44,8 +31,18 @@ and change the buffer size. o C ObjC C++ ObjC++ Joined Separate ; Documented in common.opt ---- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200 -+++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -1145,6 +1145,7 @@ + %{-help=*:--help=%*}\ + %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\ + %{fsyntax-only:-o %j} %{-param*}\ ++ %{nostdlib:-nostdlib}\ + %{coverage:-fprofile-arcs -ftest-coverage}\ + %{fprofile-arcs|fprofile-generate*|coverage:\ + %{!fprofile-update=single:\ +--- a/gcc/params.def ++++ b/gcc/params.def @@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT, DEFPARAM (PARAM_SSP_BUFFER_SIZE, "ssp-buffer-size", |