Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 739742 - sys-devel/gcc:10,11: innocuous typo in clash-protection patch
Summary: sys-devel/gcc:10,11: innocuous typo in clash-protection patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Toolchain Maintainers
URL: https://gitweb.gentoo.org/proj/gcc-pa...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-08-31 14:54 UTC by Jason Chan
Modified: 2020-08-31 18:17 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Added 3 letters to the patch (28_all_EXTRA_OPTIONS-fstack-clash-protection.patch,2.69 KB, patch)
2020-08-31 15:00 UTC, Jason Chan
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jason Chan 2020-08-31 14:54:45 UTC
*_all_EXTRA_OPTIONS-fstack-clash-protection.patch

--- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
+++ b/toplev.c	2018-04-30 16:46:37.244027303 +0200

Should be:

--- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
+++ b/gcc/toplev.c	2018-04-30 16:46:37.244027303 +0200

Reproducible: Always




Affected files:

10.1.0
https://gitweb.gentoo.org/proj/gcc-patches.git/tree/10.1.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch?id=fbda64e161da0049d14583b0126fe4d7e0aec805#n33

10.2.0
https://gitweb.gentoo.org/proj/gcc-patches.git/tree/10.2.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch?id=9bba1f72a9210743fddf664b716b5cf288132922#n33

11.0.0
https://gitweb.gentoo.org/proj/gcc-patches.git/tree/11.0.0/gentoo/27_all_EXTRA_OPTIONS-fstack-clash-protection.patch?id=fbda64e161da0049d14583b0126fe4d7e0aec805#n33
Comment 1 Jason Chan 2020-08-31 15:00:17 UTC
Created attachment 657618 [details, diff]
Added 3 letters to the patch
Comment 2 Sergei Trofimovich (RETIRED) gentoo-dev 2020-08-31 18:07:43 UTC
Good catch! 9.3.0 and 8.4.0 are also affected:

8.4.0/gentoo/11_all_extra-options.patch:+++ b/toplev.c  2018-04-30 16:46:37.244027303 +0200
9.3.0/gentoo/11_all_extra-options.patch:+++ b/toplev.c  2018-04-30 16:46:37.244027303 +0200

Looks like we are lucky here as 'patch' doe the expected thing instead of doing right thing :)
Comment 3 Larry the Git Cow gentoo-dev 2020-08-31 18:17:35 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8568b1b8782f700e97a2836ce95c4dfbcc2677df

commit 8568b1b8782f700e97a2836ce95c4dfbcc2677df
Author:     Sergei Trofimovich <slyfox@gentoo.org>
AuthorDate: 2020-08-31 18:13:46 +0000
Commit:     Sergei Trofimovich <slyfox@gentoo.org>
CommitDate: 2020-08-31 18:13:46 +0000

    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@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(-)