1 |
commit: 2c3e29ca0472b134393b0ef694431a7a53bff227 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 1 09:33:28 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 1 09:33:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=2c3e29ca |
7 |
|
8 |
4.9.4/pie: make all patches -p1 appliable |
9 |
|
10 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
11 |
|
12 |
4.9.4/pie/02_all_gcc48_config.in.patch | 4 ++-- |
13 |
4.9.4/pie/05_all_gcc48_gcc.c.patch | 4 ++-- |
14 |
4.9.4/pie/16_all_gcc47_nopie_option.patch | 2 +- |
15 |
4.9.4/pie/20_all_gcc49_config_crtbeginp.patch | 8 ++++---- |
16 |
4.9.4/pie/24_all_gcc49_invoke.texi.patch | 4 ++-- |
17 |
4.9.4/pie/README.history | 7 +++++++ |
18 |
6 files changed, 18 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/4.9.4/pie/02_all_gcc48_config.in.patch b/4.9.4/pie/02_all_gcc48_config.in.patch |
21 |
index 3b4747b..657e593 100644 |
22 |
--- a/4.9.4/pie/02_all_gcc48_config.in.patch |
23 |
+++ b/4.9.4/pie/02_all_gcc48_config.in.patch |
24 |
@@ -2,8 +2,8 @@ |
25 |
|
26 |
* gcc/config.in Add ENABLE_CRTBEGINP, ENABLE_ESP |
27 |
|
28 |
---- gcc/config.in 2009-04-21 11:08:08.000000000 +0200 |
29 |
-+++ gcc/config.in 2009-05-12 00:10:08.000000000 +0200 |
30 |
+--- a/gcc/config.in 2009-04-21 11:08:08.000000000 +0200 |
31 |
++++ b/gcc/config.in 2009-05-12 00:10:08.000000000 +0200 |
32 |
@@ -46,6 +46,12 @@ |
33 |
#endif |
34 |
|
35 |
|
36 |
diff --git a/4.9.4/pie/05_all_gcc48_gcc.c.patch b/4.9.4/pie/05_all_gcc48_gcc.c.patch |
37 |
index ddfcafd..debf723 100644 |
38 |
--- a/4.9.4/pie/05_all_gcc48_gcc.c.patch |
39 |
+++ b/4.9.4/pie/05_all_gcc48_gcc.c.patch |
40 |
@@ -3,8 +3,8 @@ |
41 |
* gcc/gcc.c include esp.h |
42 |
static const char *cc1_spec We set that in esp.h if ENABLE_ESP. |
43 |
|
44 |
---- gcc/gcc.c 2010-01-21 10:29:30.000000000 -0500 |
45 |
-+++ gcc/gcc.c 2010-01-29 23:29:16.000000000 -0500 |
46 |
+--- a/gcc/gcc.c 2010-01-21 10:29:30.000000000 -0500 |
47 |
++++ b/gcc/gcc.c 2010-01-29 23:29:16.000000000 -0500 |
48 |
@@ -44,6 +44,7 @@ |
49 |
#include "opts.h" |
50 |
#include "params.h" |
51 |
|
52 |
diff --git a/4.9.4/pie/16_all_gcc47_nopie_option.patch b/4.9.4/pie/16_all_gcc47_nopie_option.patch |
53 |
index ed9a961..e76ddf1 100644 |
54 |
--- a/4.9.4/pie/16_all_gcc47_nopie_option.patch |
55 |
+++ b/4.9.4/pie/16_all_gcc47_nopie_option.patch |
56 |
@@ -3,7 +3,7 @@ |
57 |
* gcc/common.opt Add -nopie |
58 |
|
59 |
--- a/gcc/common.opt 2011-11-23 19:51:17.000000000 +0100 |
60 |
-+++ b//gcc/common.opt 2012-01-24 16:56:24.302224357 +0100 |
61 |
++++ b/gcc/common.opt 2012-01-24 16:56:24.302224357 +0100 |
62 |
@@ -2280,6 +2280,9 @@ Driver |
63 |
nodefaultlibs |
64 |
Driver |
65 |
|
66 |
diff --git a/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch b/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch |
67 |
index 4bd5c18..62474c0 100644 |
68 |
--- a/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch |
69 |
+++ b/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch |
70 |
@@ -3,8 +3,8 @@ |
71 |
* gcc/config/gnu-user.h If ENABLE_CRTBEGINP, -static and -pie use crtbegineP.o. |
72 |
* gcc/config/rs6000/sysv4.h If ENABLE_CRTBEGINP, -static and -pie use crtbegineP.o. |
73 |
|
74 |
---- gcc/config/gnu-user.h 2014-01-02 23:23:26.000000000 +0100 |
75 |
-+++ gcc/config/gnu-user.h 2014-04-23 00:55:06.390265454 +0200 |
76 |
+--- a/gcc/config/gnu-user.h 2014-01-02 23:23:26.000000000 +0100 |
77 |
++++ b/gcc/config/gnu-user.h 2014-04-23 00:55:06.390265454 +0200 |
78 |
@@ -40,7 +40,15 @@ see the files COPYING3 and COPYING.RUNTI |
79 |
provides part of the support for getting C++ file-scope static |
80 |
object constructed before entering `main'. */ |
81 |
@@ -22,8 +22,8 @@ |
82 |
#define GNU_USER_TARGET_STARTFILE_SPEC \ |
83 |
"%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ |
84 |
crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \ |
85 |
---- gcc/config/rs6000/sysv4.h 2009-04-10 01:23:07.000000000 +0200 |
86 |
-+++ gcc/config/rs6000/sysv4.h 2009-09-08 04:41:50.000000000 +0200 |
87 |
+--- a/gcc/config/rs6000/sysv4.h 2009-04-10 01:23:07.000000000 +0200 |
88 |
++++ b/gcc/config/rs6000/sysv4.h 2009-09-08 04:41:50.000000000 +0200 |
89 |
@@ -883,7 +883,12 @@ |
90 |
%{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \ |
91 |
%{!shared: %{profile:-lc_p} %{!profile:-lc}}}" |
92 |
|
93 |
diff --git a/4.9.4/pie/24_all_gcc49_invoke.texi.patch b/4.9.4/pie/24_all_gcc49_invoke.texi.patch |
94 |
index cdda379..19d089c 100644 |
95 |
--- a/4.9.4/pie/24_all_gcc49_invoke.texi.patch |
96 |
+++ b/4.9.4/pie/24_all_gcc49_invoke.texi.patch |
97 |
@@ -3,8 +3,8 @@ |
98 |
* gcc/doc/invoke.texi Add NOTES about -fstack-protector-all, -pie and |
99 |
-fPIE/-fpie when --enable-esp is enable, this options is on by default. |
100 |
|
101 |
---- gcc/doc/invoke.texi 2009-04-01 09:18:47.000000000 +0200 |
102 |
-+++ gcc/doc/invoke.texi 2009-06-18 14:08:38.000000000 +0200 |
103 |
+--- a/gcc/doc/invoke.texi 2009-04-01 09:18:47.000000000 +0200 |
104 |
++++ b/gcc/doc/invoke.texi 2009-06-18 14:08:38.000000000 +0200 |
105 |
@@ -9233,6 +9245,11 @@ If a guard check fails, an error message |
106 |
@opindex fstack-protector-all |
107 |
Like @option{-fstack-protector} except that all functions are protected. |
108 |
|
109 |
diff --git a/4.9.4/pie/README.history b/4.9.4/pie/README.history |
110 |
index d095ef5..9f22978 100644 |
111 |
--- a/4.9.4/pie/README.history |
112 |
+++ b/4.9.4/pie/README.history |
113 |
@@ -1,3 +1,10 @@ |
114 |
+1 TODO |
115 |
+ U 02_all_gcc48_config.in.patch |
116 |
+ U 05_all_gcc48_gcc.c.patch |
117 |
+ U 16_all_gcc47_nopie_option.patch |
118 |
+ U 20_all_gcc49_config_crtbeginp.patch |
119 |
+ U 24_all_gcc49_invoke.texi.patch |
120 |
+ |
121 |
0.6.4 27 Oct 2015 |
122 |
U 24_all_gcc49_invoke.texi.patch |
123 |
0.6.3 29 Aug 2015 |