1 |
commit: 62a9d4c24e788232d2d8cb667d89a19c89af9328 |
2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 27 23:34:10 2012 +0000 |
4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 27 23:34:10 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-gccpatchset.git;a=commit;h=62a9d4c2 |
7 |
|
8 |
add changelog to upstream patches |
9 |
|
10 |
--- |
11 |
upstream/Changelog.txt | 105 +++++++++++++++++++++++ |
12 |
upstream/config.in.patch | 5 - |
13 |
upstream/gcc_doc.patch | 7 +- |
14 |
upstream/testsuite-hardening-format.patch | 4 +- |
15 |
upstream/testsuite-hardening-printf-types.patch | 2 +- |
16 |
5 files changed, 112 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/upstream/Changelog.txt b/upstream/Changelog.txt |
19 |
new file mode 100644 |
20 |
index 0000000..d8e4764 |
21 |
--- /dev/null |
22 |
+++ b/upstream/Changelog.txt |
23 |
@@ -0,0 +1,105 @@ |
24 |
+2012-08-24 Magnus Granberg <zorry@g.o |
25 |
+ |
26 |
+ * configure.ac Add new configure options espf. |
27 |
+ * Makefile.in Add -fno-stack-protector when |
28 |
+ needed for espf. |
29 |
+ gcc/ |
30 |
+ * configure.ac Add new configure options espf. |
31 |
+ * Makefile.in Add -fno-PIE when needed for |
32 |
+ espf. |
33 |
+ * config.in Add ENABLE_ESPF, |
34 |
+ ENABLE_ESPF_FORTIFY, ENABLE_ESPF_PIE and |
35 |
+ ENABLE_ESPF_SSP. |
36 |
+ * config/linux.h Define ESPF_GCC_PIE_SPEC, |
37 |
+ ESPF_GCC_SSP_SPEC, ESPF_CPP_UNIQUE_OPTIONS_SPEC, |
38 |
+ ESPF_DRIVER_SELF_SPECS and ESPF_EXTRA_SPECS. |
39 |
+ * config/i386/linux.h Define DRIVER_SELF_SPECS. |
40 |
+ * config/i386/linux64.h Likewise. |
41 |
+ * config/i386/gnu-user.h Add ESPF_EXTRA_SPECS to |
42 |
+ SUBTARGET_EXTRA_SPECS when needed. |
43 |
+ * config/i386/i386.h Likewise. |
44 |
+ * gcc.c Add espf_cpp_unique_options |
45 |
+ to cpp_unique_options when needed. |
46 |
+ * c-family/c-common.c Enable warn_format when espf is |
47 |
+ enable. |
48 |
+ * c-family/c-format.c Enable warn_format_security when |
49 |
+ needed by espf. |
50 |
+ libgcc/ |
51 |
+ * libgcc/Makefile.in Add -fno-PIE when needed for |
52 |
+ espf. |
53 |
+ |
54 |
+2012-08-26 Magnus Granberg <zorry@g.o> |
55 |
+ Kees Cook <kees@××××××.com> |
56 |
+ |
57 |
+ gcc/doc/ |
58 |
+ * invoke.texi Add notes to -Wformat, |
59 |
+ -Wformat-security, -O2, -fstack-protector, -fPIE and |
60 |
+ -pie for espf. |
61 |
+ * install.texi Add new configure options |
62 |
+ |
63 |
+2012-08-26 Magnus Granberg <zorry@g.o> |
64 |
+ Kees Cook <kees@××××××.com> |
65 |
+ |
66 |
+ gcc/testsuite |
67 |
+ * gcc.dg/charset/builtin2.c Add |
68 |
+ -Wno-format when effective_target is espf. |
69 |
+ * gcc.dg/format/format.exp Likewise. |
70 |
+ * gcc.dg/pr30473.c Likewise. |
71 |
+ * gcc.dg/pr38902.c Likewise. |
72 |
+ * gcc.dg/ipa/ipa-sra-1.c Likewise. |
73 |
+ * gcc.dg/torture/tls/tls-test.c Likewise. |
74 |
+ * g++.dg/abi/pragma-pack1.C Likewise. |
75 |
+ * g++.dg/cpp0x/constexpr-tuple.C Likewise. |
76 |
+ * lib/target-supports.exp Add |
77 |
+ check_effective_target_espf. |
78 |
+ * gcc.c-torture/execute/memset-1.x New file |
79 |
+ * gcc.c-torture/execute/vprintf-chk-1.x Likewise. |
80 |
+ * gcc.c-torture/execute/vfprintf-chk-1.x Likewise. |
81 |
+ * gcc.dg/stack-usage-1.c Add -fno-stack-protector |
82 |
+ when effective_target is espf. |
83 |
+ * gcc.dg/superblock.c Likewise. |
84 |
+ * gcc.dg/20021014-1.c Add -fno-PIE when |
85 |
+ effective_target is espf. |
86 |
+ * gcc.dg/nest.c Likewise. |
87 |
+ * gcc.dg/nested-func-4.c Likewise. |
88 |
+ * gcc.dg/pr32450.c Likewise. |
89 |
+ * gcc.dg/pr43643.c Likewise. |
90 |
+ * g++.dg/other/anon5.C Likewise. |
91 |
+ * g++.old-deja/g++.law/profile1.C Likewise. |
92 |
+ * gcc.dg/tree-ssa/ssa-store-ccp-3.c Skip the test. |
93 |
+ |
94 |
+2012-08-27 Magnus Granberg <zorry@g.o> |
95 |
+ Kees Cook <kees@××××××.com> |
96 |
+ |
97 |
+ gcc/testsuite/ |
98 |
+ PR 39537 |
99 |
+ * g++.dg/ext/align1.C Remove printf |
100 |
+ * g++.old-deja/g++.law/operators28.C Fix format-string/type. |
101 |
+ * gcc.dg/torture/matrix-2.c Likewise. |
102 |
+ * gcc.dg/packed-vla.c Likewise. |
103 |
+ * g++.dg/opt/alias2.C Likewise. |
104 |
+ * g++.old-deja/g++.abi/vbase1.C Likewise. |
105 |
+ * g++.old-deja/g++.brendan/template8.C Likewise. |
106 |
+ * g++.old-deja/g++.eh/ptr1.C Likewise. |
107 |
+ * g++.old-deja/g++.jason/access23.C Likewise. |
108 |
+ * g++.old-deja/g++.law/cvt8.C Likewise. |
109 |
+ * g++.old-deja/g++.mike/net35.C Likewise. |
110 |
+ * g++.old-deja/g++.mike/offset1.C Likewise. |
111 |
+ * g++.old-deja/g++.mike/p12306.C Likewise. |
112 |
+ * g++.old-deja/g++.mike/p3579.C Likewise. |
113 |
+ * g++.old-deja/g++.mike/p3708a.C Likewise. |
114 |
+ * g++.old-deja/g++.mike/p3708b.C Likewise. |
115 |
+ * g++.old-deja/g++.mike/p3708.C Likewise. |
116 |
+ * g++.old-deja/g++.mike/p646.C Likewise. |
117 |
+ * g++.old-deja/g++.mike/p710.C Likewise. |
118 |
+ * g++.old-deja/g++.mike/p789a.C Likewise. |
119 |
+ * g++.old-deja/g++.mike/pmf2.C Likewise. |
120 |
+ * g++.old-deja/g++.mike/temp.C Likewise. |
121 |
+ * g++.old-deja/g++.other/temporary1.C Likewise. |
122 |
+ * g++.old-deja/g++.other/virtual8.C Likewise. |
123 |
+ * g++.old-deja/g++.pt/memtemp23.C Likewise. |
124 |
+ * g++.old-deja/g++.pt/memtemp24.C Likewise. |
125 |
+ * g++.old-deja/g++.pt/memtemp25.C Likewise. |
126 |
+ * g++.old-deja/g++.pt/memtemp26.C Likewise. |
127 |
+ * g++.old-deja/g++.pt/t39.C Likewise. |
128 |
+ * g++.old-deja/g++.robertl/eb17.C Likewise. |
129 |
|
130 |
diff --git a/upstream/config.in.patch b/upstream/config.in.patch |
131 |
index 7bd846e..7c1f849 100644 |
132 |
--- a/upstream/config.in.patch |
133 |
+++ b/upstream/config.in.patch |
134 |
@@ -1,8 +1,3 @@ |
135 |
-2012-04-08 Magnus Granberg <zorry@g.o> |
136 |
- |
137 |
- * gcc/config.in Add ENABLE_ESPF, ENABLE_ESPF_FORTIFY, |
138 |
- ENABLE_ESPF_PIE and ENABLE_ESPF_SSP |
139 |
- |
140 |
--- a/gcc/config.in 2011-04-24 00:36:52.000000000 +0200 |
141 |
+++ b/gcc/config.in 2011-06-24 14:17:05.166236726 +0200 |
142 |
@@ -77,6 +77,29 @@ |
143 |
|
144 |
diff --git a/upstream/gcc_doc.patch b/upstream/gcc_doc.patch |
145 |
index fc39347..3aa53ad 100644 |
146 |
--- a/upstream/gcc_doc.patch |
147 |
+++ b/upstream/gcc_doc.patch |
148 |
@@ -79,7 +79,7 @@ |
149 |
Do not use jump tables for switch statements even where it would be |
150 |
--- a/gcc/doc/install.texi 2012-03-02 10:37:30.000000000 +0100 |
151 |
+++ b/gcc/doc/install.texi 2012-07-23 18:05:14.160784593 +0200 |
152 |
-@@ -1392,6 +1392,17 @@ do a @samp{make -C gcc gnatlib_and_tools |
153 |
+@@ -1392,6 +1392,18 @@ do a @samp{make -C gcc gnatlib_and_tools |
154 |
Specify that the run-time libraries for stack smashing protection |
155 |
should not be built. |
156 |
|
157 |
@@ -91,8 +91,9 @@ |
158 |
+@option{-fPIE} and @option{-pie} by default. if the support is there. If you |
159 |
+use @samp{ssp} it will turn on @option{-fstack-protection} by default if the |
160 |
+support is there. If you use @samp{pie} it will turn on @option{-fPIE} and |
161 |
-+@option{-pie} by default if the support is there. We only support |
162 |
-+i?86*-*-linux*, x86_32*-*-linux* and x86_64*-*-linux* as target for now. |
163 |
++@option{-pie} by default if the support is there. If you use @samp{no} it will |
164 |
++not turn on any options. We only support i?86*-*-linux*, x86_32*-*-linux* |
165 |
++and x86_64*-*-linux* as target for now. |
166 |
+ |
167 |
@item --disable-libquadmath |
168 |
Specify that the GCC quad-precision math library should not be built. |
169 |
|
170 |
diff --git a/upstream/testsuite-hardening-format.patch b/upstream/testsuite-hardening-format.patch |
171 |
index 3b9583d..0d14c10 100644 |
172 |
--- a/upstream/testsuite-hardening-format.patch |
173 |
+++ b/upstream/testsuite-hardening-format.patch |
174 |
@@ -59,8 +59,8 @@ |
175 |
struct bovid |
176 |
{ |
177 |
--- a/gcc/testsuite/gcc.dg/torture/tls/tls-test.c 2011-06-22 19:27:07.000000000 +0200 |
178 |
-+++ b/gcc/testsuite/gcc.dg/torture/tls/tls-test.c 2012-07-31 14:40:00.411552986 +0200 |
179 |
-@@ -1,7 +1,8 @@ |
180 |
++++ b/gcc/testsuite/gcc.dg/torture/tls/tls-test.c 2012-08-21 23:51:33.205398132 +0200 |
181 |
+@@ -2,6 +2,7 @@ |
182 |
/* { dg-require-effective-target tls } */ |
183 |
/* { dg-require-effective-target pthread } */ |
184 |
/* { dg-options "-pthread" } */ |
185 |
|
186 |
diff --git a/upstream/testsuite-hardening-printf-types.patch b/upstream/testsuite-hardening-printf-types.patch |
187 |
index 4fa6b5d..8ca807e 100644 |
188 |
--- a/upstream/testsuite-hardening-printf-types.patch |
189 |
+++ b/upstream/testsuite-hardening-printf-types.patch |
190 |
@@ -519,7 +519,7 @@ |
191 |
|
192 |
int c[16]; |
193 |
}; |
194 |
---- agcc/testsuite/g++.old-deja/g++.pt/memtemp24.C |
195 |
+--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp24.C |
196 |
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp24.C |
197 |
@@ -13,7 +13,7 @@ |