[gentoo-commits] proj/gcc-patches:master commit in: 10.2.0/gentoo/, 9.3.0/gentoo/, 8.4.0/gentoo/, 11.0.0/gentoo/

[Sergei Trofimovich]

commit:     8568b1b8782f700e97a2836ce95c4dfbcc2677df
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 18:13:46 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 18:13:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8568b1b8

fix extra opts patch to contain correct target file name

Before the change patches implied different file targets:

  --- a/gcc/toplev.c
  +++ b/toplev.c

It was not patch's intention. Luckily patch did not perform
a file copy. Fixed to:

  --- a/gcc/toplev.c
  +++ b/gcc/toplev.c

Thanks to Jason Chan who noticed it and proposed a fix!

Fixed-by: Jason Chan
Closes: https://bugs.gentoo.org/739742
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 10.2.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch | 2 +-
 10.2.0/gentoo/README.history                                     | 3 +++
 11.0.0/gentoo/27_all_EXTRA_OPTIONS-fstack-clash-protection.patch | 2 +-
 11.0.0/gentoo/README.history                                     | 3 +++
 8.4.0/gentoo/11_all_extra-options.patch                          | 2 +-
 8.4.0/gentoo/README.history                                      | 1 +
 9.3.0/gentoo/11_all_extra-options.patch                          | 2 +-
 9.3.0/gentoo/README.history                                      | 1 +
 8 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/10.2.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch b/10.2.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch
index 95dd37e..d1bb202 100644
--- a/10.2.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/10.2.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch
@@ -30,7 +30,7 @@ On Hardened we add some options like -fstack-clash-protection.
     vtable entries.  Setting this nonzero tells the compiler to use
     function descriptors instead.  The value of this macro says how
 --- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
-+++ b/toplev.c	2018-04-30 16:46:37.244027303 +0200
++++ b/gcc/toplev.c	2018-04-30 16:46:37.244027303 +0200
 @@ -1682,6 +1682,10 @@ process_options (void)
  
    /* -fstack-clash-protection is not currently supported on targets

diff --git a/10.2.0/gentoo/README.history b/10.2.0/gentoo/README.history
index 1bfe565..ab2ac3c 100644
--- a/10.2.0/gentoo/README.history
+++ b/10.2.0/gentoo/README.history
@@ -1,3 +1,6 @@
+3		TODO
+	U 28_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+
 2		23 Aug 2020
 	+ 33_all_lto-O0-mix-ICE-ipa-PR96291.patch
 	+ 34_all_fundecl-ICE-PR95820.patch

diff --git a/11.0.0/gentoo/27_all_EXTRA_OPTIONS-fstack-clash-protection.patch b/11.0.0/gentoo/27_all_EXTRA_OPTIONS-fstack-clash-protection.patch
index 95dd37e..d1bb202 100644
--- a/11.0.0/gentoo/27_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/11.0.0/gentoo/27_all_EXTRA_OPTIONS-fstack-clash-protection.patch
@@ -30,7 +30,7 @@ On Hardened we add some options like -fstack-clash-protection.
     vtable entries.  Setting this nonzero tells the compiler to use
     function descriptors instead.  The value of this macro says how
 --- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
-+++ b/toplev.c	2018-04-30 16:46:37.244027303 +0200
++++ b/gcc/toplev.c	2018-04-30 16:46:37.244027303 +0200
 @@ -1682,6 +1682,10 @@ process_options (void)
  
    /* -fstack-clash-protection is not currently supported on targets

diff --git a/11.0.0/gentoo/README.history b/11.0.0/gentoo/README.history
index b3e6ea1..a34b96d 100644
--- a/11.0.0/gentoo/README.history
+++ b/11.0.0/gentoo/README.history
@@ -1,3 +1,6 @@
+5		TODO
+	U 27_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+
 4		26 Aug 2020
 	- 25_all_hppa-faster-synth_mult.patch
 

diff --git a/8.4.0/gentoo/11_all_extra-options.patch b/8.4.0/gentoo/11_all_extra-options.patch
index 9187af8..42c288c 100644
--- a/8.4.0/gentoo/11_all_extra-options.patch
+++ b/8.4.0/gentoo/11_all_extra-options.patch
@@ -30,7 +30,7 @@ On Hardened we add some options like -fstack-clash-protection and -z now
     vtable entries.  Setting this nonzero tells the compiler to use
     function descriptors instead.  The value of this macro says how
 --- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
-+++ b/toplev.c	2018-04-30 16:46:37.244027303 +0200
++++ b/gcc/toplev.c	2018-04-30 16:46:37.244027303 +0200
 @@ -1682,6 +1682,10 @@ process_options (void)
  
    /* -fstack-clash-protection is not currently supported on targets

diff --git a/8.4.0/gentoo/README.history b/8.4.0/gentoo/README.history
index c9566f7..e072ed5 100644
--- a/8.4.0/gentoo/README.history
+++ b/8.4.0/gentoo/README.history
@@ -1,5 +1,6 @@
 3	TODO
 	+ 31_all_plugin-objdump.patch
+	U 11_all_extra-options.patch
 
 2	29 May 2020
 	+ 29_all_libcpp-ar.patch

diff --git a/9.3.0/gentoo/11_all_extra-options.patch b/9.3.0/gentoo/11_all_extra-options.patch
index 9187af8..42c288c 100644
--- a/9.3.0/gentoo/11_all_extra-options.patch
+++ b/9.3.0/gentoo/11_all_extra-options.patch
@@ -30,7 +30,7 @@ On Hardened we add some options like -fstack-clash-protection and -z now
     vtable entries.  Setting this nonzero tells the compiler to use
     function descriptors instead.  The value of this macro says how
 --- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
-+++ b/toplev.c	2018-04-30 16:46:37.244027303 +0200
++++ b/gcc/toplev.c	2018-04-30 16:46:37.244027303 +0200
 @@ -1682,6 +1682,10 @@ process_options (void)
  
    /* -fstack-clash-protection is not currently supported on targets

diff --git a/9.3.0/gentoo/README.history b/9.3.0/gentoo/README.history
index d8c024d..9dbbc19 100644
--- a/9.3.0/gentoo/README.history
+++ b/9.3.0/gentoo/README.history
@@ -1,5 +1,6 @@
 4		TODO
 	+ 30_all_plugin-objdump.patch
+	U 11_all_extra-options.patch
 
 3		29 May 2020
 	+ 29_all_libcpp-ar.patch