Gentoo Archives: gentoo-commits

From: "Magnus Granberg (zorry)" <zorry@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gcc/6.4.0/gentoo: 13_all_default-ssp-fix.patch README.history
Date: Thu, 03 May 2018 10:47:23
Message-Id: 20180503104718.07B9339@oystercatcher.gentoo.org
1 zorry 18/05/03 10:47:18
2
3 Modified: 13_all_default-ssp-fix.patch README.history
4 Log:
5 Update patches for gcc 6.4 and 7.3 in the patchset
6
7 Revision Changes Path
8 1.2 src/patchsets/gcc/6.4.0/gentoo/13_all_default-ssp-fix.patch
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/13_all_default-ssp-fix.patch?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/13_all_default-ssp-fix.patch?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/13_all_default-ssp-fix.patch?r1=1.1&r2=1.2
13
14 Index: 13_all_default-ssp-fix.patch
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/6.4.0/gentoo/13_all_default-ssp-fix.patch,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- 13_all_default-ssp-fix.patch 2 Aug 2017 18:21:23 -0000 1.1
21 +++ 13_all_default-ssp-fix.patch 3 May 2018 10:47:17 -0000 1.2
22 @@ -1,44 +1,27 @@
23 -We disable ssp on -nostdlib and -ffreestanding as we did on older gcc
24 -and change the buffer size.
25 +Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
26 +Change the buffer size.
27
28 ---- a/gcc/c-family/c-opts.c 2016-03-08 23:30:44.000000000 +0100
29 -+++ b/gcc/c-family/c-opts.c 2016-09-18 18:42:10.231644014 +0200
30 -@@ -436,7 +436,15 @@ c_common_handle_option (size_t scode, co
31 +--- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200
32 ++++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100
33 +@@ -857,6 +857,12 @@ proper position among the other output f
34 + #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
35 + #endif
36
37 - case OPT_ffreestanding:
38 - value = !value;
39 -+ if (global_options.x_flag_stack_protect == -1)
40 -+ global_options.x_flag_stack_protect = 0;
41 - /* Fall through.... */
42 ++#ifdef ENABLE_DEFAULT_SSP
43 ++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
44 ++#else
45 ++#define NO_SSP_SPEC ""
46 ++#endif
47 +
48 -+ case OPT_nostdlib:
49 -+ if (global_options.x_flag_stack_protect == -1)
50 -+ global_options.x_flag_stack_protect = 0;
51 -+ /* Fall through.... */
52 -+
53 - case OPT_fhosted:
54 - flag_hosted = value;
55 - flag_no_builtin = !value;
56 ---- a/gcc/c-family/c.opt 2016-03-23 18:51:56.000000000 +0100
57 -+++ b/gcc/c-family/c.opt 2016-09-18 18:46:17.071649782 +0200
58 -@@ -1647,6 +1647,10 @@ nostdinc++
59 - C++ ObjC++
60 - Do not search standard system include directories for C++.
61 -
62 -+nostdlib
63 -+C ObjC C++ ObjC++
64 -+; Documented in common.opt
65 -+
66 - o
67 - C ObjC C++ ObjC++ Joined Separate
68 - ; Documented in common.opt
69 ---- a/gcc/gcc.c 2016-02-19 23:18:38.000000000 +0100
70 -+++ b/gcc/gcc.c 2016-09-18 18:47:35.621651618 +0200
71 -@@ -1132,6 +1143,7 @@ static const char *cc1_options =
72 + #ifndef LINK_SSP_SPEC
73 + #ifdef TARGET_LIBC_PROVIDES_SSP
74 + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
75 +@@ -1131,7 +1148,7 @@ static const char *cc1_options =
76 + %{-version:--version}\
77 %{-help=*:--help=%*}\
78 %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
79 - %{fsyntax-only:-o %j} %{-param*}\
80 -+ %{nostdlib:-nostdlib}\
81 +- %{fsyntax-only:-o %j} %{-param*}\
82 ++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
83 %{coverage:-fprofile-arcs -ftest-coverage}";
84
85 static const char *asm_options =
86
87
88
89 1.6 src/patchsets/gcc/6.4.0/gentoo/README.history
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history?rev=1.6&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history?rev=1.6&content-type=text/plain
93 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history?r1=1.5&r2=1.6
94
95 Index: README.history
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history,v
98 retrieving revision 1.5
99 retrieving revision 1.6
100 diff -u -r1.5 -r1.6
101 --- README.history 12 Jan 2018 07:36:17 -0000 1.5
102 +++ README.history 3 May 2018 10:47:17 -0000 1.6
103 @@ -1,3 +1,5 @@
104 +1.4 03 Maj 2018
105 + U 13_all_default-ssp-fix.patch
106 1.3 12 Jan 2018
107 + 97_all_libjava-ucontext.patch
108 1.2 06 Jan 2018