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: upstream/
Date: Sun, 08 Apr 2012 13:00:37
Message-Id: 1333890005.a44df2af465660e2c3cd05328d4b855b50dc8e8e.zorry@gentoo
1 commit: a44df2af465660e2c3cd05328d4b855b50dc8e8e
2 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 8 13:00:05 2012 +0000
4 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 13:00:05 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-gccpatchset.git;a=commit;h=a44df2af
7
8 Updated config.in patch for upstream
9
10 ---
11 upstream/config.in.patch | 21 ++++-----------------
12 1 files changed, 4 insertions(+), 17 deletions(-)
13
14 diff --git a/upstream/config.in.patch b/upstream/config.in.patch
15 index 89f5ec4..7bd846e 100644
16 --- a/upstream/config.in.patch
17 +++ b/upstream/config.in.patch
18 @@ -1,12 +1,11 @@
19 -2010-06-24 Magnus Granberg <zorry@g.o>
20 +2012-04-08 Magnus Granberg <zorry@g.o>
21
22 - * gcc/config.in Add ENABLE_ESPF, ENABLE_ESPF_FORTIFY
23 - ENABLE_ESPF_NOW, ENABLE_ESPF_PIE, ENABLE_ESPF_RELRO
24 - and ENABLE_ESPF_SSP
25 + * gcc/config.in Add ENABLE_ESPF, ENABLE_ESPF_FORTIFY,
26 + ENABLE_ESPF_PIE and ENABLE_ESPF_SSP
27
28 --- a/gcc/config.in 2011-04-24 00:36:52.000000000 +0200
29 +++ b/gcc/config.in 2011-06-24 14:17:05.166236726 +0200
30 -@@ -77,6 +77,41 @@
31 +@@ -77,6 +77,29 @@
32 #endif
33
34
35 @@ -22,24 +21,12 @@
36 +#endif
37 +
38 +
39 -+/* Define to 1 to enable espf with -z now when linking. */
40 -+#ifndef USED_FOR_TARGET
41 -+#undef ENABLE_ESPF_NOW
42 -+#endif
43 -+
44 -+
45 +/* Define to 1 to enable espf with -fPIE -pie. */
46 +#ifndef USED_FOR_TARGET
47 +#undef ENABLE_ESPF_PIE
48 +#endif
49 +
50 +
51 -+/* Define to 1 to enable espf with -z relro when linking. */
52 -+#ifndef USED_FOR_TARGET
53 -+#undef ENABLE_ESPF_RELRO
54 -+#endif
55 -+
56 -+
57 +/* Define to 1 to enable espf with -fstack-protector. */
58 +#ifndef USED_FOR_TARGET
59 +#undef ENABLE_ESPF_SSP