Gentoo Archives: gentoo-commits

From: Magnus Granberg <zorry@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-gccpatchset:master commit in: gcc-4.5.0/piepatch/, upstream/
Date: Thu, 22 Dec 2011 20:20:04
Message-Id: fb1940a404ba2fdb87572b754815d39fa14a2c96.zorry@gentoo
1 commit: fb1940a404ba2fdb87572b754815d39fa14a2c96
2 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 22 20:18:52 2011 +0000
4 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 22 20:18:52 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-gccpatchset.git;a=commit;h=fb1940a4
7
8 update it to 0.4.7 fix 394821
9
10 ---
11 gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch | 18 ++++++-
12 gcc-4.5.0/piepatch/README.Changelog | 6 ++
13 gcc-4.5.0/piepatch/README.history | 62 ++++++++++++---------
14 upstream/configure.ac.patch | 2 +-
15 4 files changed, 59 insertions(+), 29 deletions(-)
16
17 diff --git a/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch b/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch
18 index a1f1cd1..c3e18bd 100644
19 --- a/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch
20 +++ b/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch
21 @@ -1,4 +1,4 @@
22 -2011-12-06 Magnus Granberg <zorry@g.o> Anthony G. Basile <basile@××××××××××××××.edu>
23 +2011-12-21 Magnus Granberg <zorry@g.o> Anthony G. Basile <basile@××××××××××××××.edu>
24
25 * Makefile.in We add -fno-stack-protector to BOOT_CFLAGS, LIBCFLAGS and LIBCXXFLAGS if enable_esp yes.
26 * gcc/Makefile.in Add -fno-PIE and -fno-stack-protector.
27 @@ -99,6 +99,22 @@
28 # List of extra object files that should be compiled and linked with
29 # compiler proper (cc1, cc1obj, cc1plus).
30 EXTRA_OBJS = @extra_objs@
31 +@@ -1002,12 +1010,12 @@
32 +
33 + # This is the variable actually used when we compile. If you change this,
34 + # you probably want to update BUILD_CFLAGS in configure.ac
35 +-ALL_CFLAGS = $(T_CFLAGS) \
36 ++ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \
37 + $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@
38 +
39 + # The C++ version.
40 +-ALL_CXXFLAGS = $(T_CFLAGS) $(CXXFLAGS) $(INTERNAL_CFLAGS) \
41 +- $(COVERAGE_FLAGS) $(WARN_CXXFLAGS) @DEFS@
42 ++ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CXXFLAGS) \
43 ++ $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CXXFLAGS) @DEFS@
44 +
45 + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro
46 + # puts -I options in CPPFLAGS, our include files in the srcdir will always
47 @@ -1856,9 +1873,10 @@
48 echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
49 echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
50
51 diff --git a/gcc-4.5.0/piepatch/README.Changelog b/gcc-4.5.0/piepatch/README.Changelog
52 index 53b7b44..aaecc31 100644
53 --- a/gcc-4.5.0/piepatch/README.Changelog
54 +++ b/gcc-4.5.0/piepatch/README.Changelog
55 @@ -1,3 +1,9 @@
56 +0.4.7 Magnus Granberg <zorry@g.o>
57 +
58 + #394821 #380823 (ported from 4.6)
59 + * gcc/Makefile.in added ESP_NOPIE_CFLAGS to ALL_CXXFLAGS
60 + and ALL_CFLAGS
61 +
62 0.4.6 Magnus Granberg <zorry@g.o>
63
64 #393321
65
66 diff --git a/gcc-4.5.0/piepatch/README.history b/gcc-4.5.0/piepatch/README.history
67 index a226a3b..aa5eae5 100644
68 --- a/gcc-4.5.0/piepatch/README.history
69 +++ b/gcc-4.5.0/piepatch/README.history
70 @@ -1,4 +1,7 @@
71 -0.4.6 06-12-2011
72 +0.4.7 21 Dec 2011
73 + U 12_all_gcc45_Makefile.in.patch
74 +
75 +0.4.6 06 Dec 2011
76 + 35_all_gcc45_config_crtbeginp.patch
77 - 35_all_gcc44_config_crtbegints.patch
78 U 10_all_gcc45_configure.patch
79 @@ -7,25 +10,30 @@
80 - 11_all_gcc44_config.in.patch
81 + 30_all_gcc45_esp.h.patch
82 - 30_all_gcc44_esp.h.patch
83 -0.4.5 18-06-2010
84 +
85 +0.4.5 18 Jun 2010
86 U 35_all_gcc44_config_crtbegints.patch
87 -0.4.4 26-05-2010
88 +
89 +0.4.4 26 May 2010
90 U 30_all_gcc44_esp.h.patch
91 -0.4.3 26-05-2010
92 +
93 +0.4.3 26 May 2010
94 U 20_all_gcc44_gcc.c.patch
95 U 30_all_gcc44_esp.h.patch
96 -0.4.2 24-05-2010
97 +
98 +0.4.2 24 May 2010
99 U 10_all_gcc44_configure.patch
100 U 12_all_gcc44_Makefile.in.patch
101 U 11_all_gcc44_config.in.patch
102 U 30_all_gcc44_esp.h.patch
103 -0.4.1 29-04-2010
104 +
105 +0.4.1 29 Apr 2010
106 U 10_all_gcc45_configure.patch
107 U 12_all_gcc45_Makefile.in.patch
108 U 11_all_gcc44_config.in.patch
109 U 30_all_gcc44_esp.h.patch
110
111 -0.4.0 19-04-2010
112 +0.4.0 19 Apr 2010
113 U 10_all_gcc45_configure.patch
114 U 12_all_gcc45_Makefile.in.patch
115 U 11_all_gcc44_config.in.patch
116 @@ -33,23 +41,23 @@
117 - 30_all_gcc44_espf.h.patch
118 + 30_all_gcc44_esp.h.patch
119
120 -0.3.9 14-04-2010
121 +0.3.9 14 Apr 2010
122 U 10_all_gcc45_configure.patch
123 - 50_all_gcc44_no_ssp_tls_uclibc.patch
124 U 33_all_gcc45_config_rs6000_linux64.h.patch
125
126 -0.3.8 10-04-2010
127 +0.3.8 10 Apr 2010
128 10_all_gcc44_configure.patch
129 11_all_gcc44_config.in.patch
130 20_all_gcc44_gcc.c.patch
131 30_all_gcc44_espf.h.patch
132
133 -0.3.7 10-02-2010
134 +0.3.7 10 Feb 2010
135 20_all_gcc44_gcc.c.patch
136 30_all_gcc44_espf.h.patch
137 10_all_gcc44_configure.patch
138
139 -0.3.6 23-12-2009
140 +0.3.6 23 Dec 2009
141 - 10_all_gcc44_configure.patch
142 + 10_all_gcc44_configure.patch
143 - 30_all_gcc44_espf.h.patch
144 @@ -61,7 +69,7 @@
145 - README
146 + README
147
148 -0.3.5 24-09-2009
149 +0.3.5 24 Sep 2009
150 - 30_all_gcc44_espf.h.patch
151 + 30_all_gcc44_espf.h.patch
152 - 35_all_gcc44_config_crtbegints.patch
153 @@ -73,7 +81,7 @@
154 + README.history
155 + README.Gentoo.patches
156
157 -0.3.4 11-09-2009
158 +0.3.4 11 Sep 2009
159 - 10_all_gcc44_configure.patch
160 + 10_all_gcc44_configure.patch
161 - 11_all_gcc44_config.in.patch
162 @@ -94,11 +102,11 @@
163 - README
164 + README
165
166 -0.3.3 14-08-2009
167 +0.3.3 14 Aug 2009
168 - 23_all_gcc44_opts.c.patch
169 + 23_all_gcc44_opts.c.patch
170
171 -0.3.2 09-08-2009
172 +0.3.2 09 Aug 2009
173 + 50_all_gcc44_no_ssp_tls_uclibc.patch
174 + README.Changelog
175 + README.history
176 @@ -107,11 +115,11 @@
177 - 30_all_gcc44-espf.h.patch
178 + 30_all_gcc44-espf.h.patch
179
180 -0.3.1 23-07-2009
181 +0.3.1 23 Jul 2009
182 - 10_all_gcc44_configure.patch
183 + 10_all_gcc44_configure.patch
184
185 -0.3.0 23-07-2009
186 +0.3.0 23 Jul 2009
187 - 10_all_gcc44_configure.patch
188 + 10_all_gcc44_configure.patch
189 - 11_all_gcc44_config.in.patch
190 @@ -127,7 +135,7 @@
191 - 30_all_gcc44-espf.h.patch
192 + 30_all_gcc44-espf.h.patch
193
194 -0.2.9 14-06-2009
195 +0.2.9 14 Jun 2009
196 - 12_all_gcc44_Makefile.in.patch
197 + 12_all_gcc44_Makefile.in.patch
198 - 30_all_gcc44-espf.h.patch
199 @@ -135,7 +143,7 @@
200 - 50_all_gcc44_gentoo_v20090612.2.patch
201 + 50_all_gcc44_gentoo_v20090614.1.patch
202
203 -0.2.8 12-06-2009
204 +0.2.8 12 Jun 2009
205 - 10_all_gcc44_configure.patch
206 + 10_all_gcc44_configure.patch
207 - 11_all_gcc44_config.in.patch
208 @@ -147,7 +155,7 @@
209 + 30_all_gcc44-espf.h.patch
210 + 50_all_gcc44_gentoo_v20090612.2.patch
211
212 -0.2.7 29-05-2009
213 +0.2.7 29 May 2009
214 - 11_all_gcc44_config.in.patch
215 + 11_all_gcc44_config.in.patch
216 - 12_all_gcc44_Makefile.in.patch
217 @@ -159,14 +167,14 @@
218 + 25_all_gcc44-espf.h.patch
219 - 30_all_gcc44-config-defaul-linux.patch
220
221 -0.2.6 28-05-2009
222 +0.2.6 28 May 2009
223 + 22_all_gcc44-toplev.c.patch
224 - 25_all_gcc44-espf.h.patch
225 + 25_all_gcc44-espf.h.patch
226 - 30_all_gcc44-config-defaul-linux.patch
227 + 30_all_gcc44-config-defaul-linux.patch
228
229 -0.2.5 27-05-2009
230 +0.2.5 27 May 2009
231 - 10_all_gcc44_configure.patch
232 + 10_all_gcc44_configure.patch
233 - 12_all_gcc44_Makefile.in.patch
234 @@ -179,17 +187,17 @@
235 + 30_all_gcc44-config-defaul-linux.patch
236 - 40_all_gcc44-gentoo.patch
237
238 -0.2.4 08-05-2009
239 +0.2.4 08 May 2009
240 - 12_all_gcc44_Makefile.in.patch
241 + 12_all_gcc44_Makefile.in.patch
242
243 -0.2.3 08-05-2009
244 +0.2.3 08 May 2009
245 - 20_all_gcc44_gcc.c.patch
246 + 20_all_gcc44_gcc.c.patch
247 - 40_all_gcc44-gentoo.patch
248 + 40_all_gcc44-gentoo.patch
249
250 -0.2.2 04-05-2009
251 +0.2.2 04 May 2009
252 + 10_all_gcc44_configure.patch
253 + 11_all_gcc44_config.in.patch
254 + 12_all_gcc44_Makefile.in.patch
255 @@ -211,7 +219,7 @@
256 - 23_all_gcc44-gcc_varasm.c.patch
257 - 30_all_gcc44-add-crt-start-endfiles-linux.patch
258
259 -0.2.1 28-04-2009
260 +0.2.1 28 Apr 2009
261 + 01_all_gcc44-configure.patch
262 + 10_all_gcc44-gcc_configure.patch
263 + 11_all_gcc44-gcc_config.in.patch
264 @@ -232,7 +240,7 @@
265 - 20-all_gcc4.4-default-crt-start-endfile.patch
266 - 30-all_gcc4.4-crtbeginTS-fno-PIE.patch
267
268 -0.1.0 16.04.2009
269 +0.1.0 16 Apr 2009
270 + 00_all_gcc4.4-cvs-incompat.patch
271 + 05_all_gcc4.4-compile-no-ssp.patch
272 + 10_all_gcc4.4-hardened-minispecs-support.patch
273
274 diff --git a/upstream/configure.ac.patch b/upstream/configure.ac.patch
275 index 396cd0e..b08edcc 100644
276 --- a/upstream/configure.ac.patch
277 +++ b/upstream/configure.ac.patch
278 @@ -19,7 +19,7 @@
279 + Linux targets supported x86_64.])],
280 +[
281 + case $target in
282 -+ x86_64*-*-linux*)
283 ++ i?86*-*-linux* | x86_64*-*-linux* | x86_x32*-*-linux | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux*)
284 + enable_espf=yes
285 + ;;
286 + *)