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/7.3.0/gentoo: 13_all_default-ssp-fix.patch 55_all_extra-options.patch README.history
Date: Thu, 03 May 2018 10:47:22
Message-Id: 20180503104718.194A23A@oystercatcher.gentoo.org
1 zorry 18/05/03 10:47:18
2
3 Modified: 13_all_default-ssp-fix.patch
4 55_all_extra-options.patch README.history
5 Log:
6 Update patches for gcc 6.4 and 7.3 in the patchset
7
8 Revision Changes Path
9 1.2 src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch?r1=1.1&r2=1.2
14
15 Index: 13_all_default-ssp-fix.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- 13_all_default-ssp-fix.patch 25 Jan 2018 21:20:43 -0000 1.1
22 +++ 13_all_default-ssp-fix.patch 3 May 2018 10:47:18 -0000 1.2
23 @@ -1,48 +1,32 @@
24 -We disable ssp on -nostdlib and -ffreestanding as we did on older gcc
25 -and change the buffer size.
26 +Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
27 +Change the buffer size.
28
29 ---- a/gcc/c-family/c-opts.c
30 -+++ b/gcc/c-family/c-opts.c
31 -@@ -450,7 +450,14 @@
32 +--- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200
33 ++++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100
34 +@@ -857,6 +857,12 @@ proper position among the other output f
35 + #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
36 + #endif
37
38 - case OPT_ffreestanding:
39 - value = !value;
40 -+ if (global_options.x_flag_stack_protect == -1)
41 -+ global_options.x_flag_stack_protect = 0;
42 - /* Fall through. */
43 ++#ifdef ENABLE_DEFAULT_SSP
44 ++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
45 ++#else
46 ++#define NO_SSP_SPEC ""
47 ++#endif
48 +
49 -+ case OPT_nostdlib:
50 -+ if (global_options.x_flag_stack_protect == -1)
51 -+ global_options.x_flag_stack_protect = 0;
52 -+
53 - case OPT_fhosted:
54 - flag_hosted = value;
55 - flag_no_builtin = !value;
56 ---- a/gcc/c-family/c.opt
57 -+++ b/gcc/c-family/c.opt
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
70 -+++ b/gcc/gcc.c
71 -@@ -1145,6 +1145,7 @@
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 - %{coverage:-fprofile-arcs -ftest-coverage}\
82 - %{fprofile-arcs|fprofile-generate*|coverage:\
83 - %{!fprofile-update=single:\
84 ---- a/gcc/params.def
85 -+++ b/gcc/params.def
86 +- %{fsyntax-only:-o %j} %{-param*}\
87 ++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
88 + %{coverage:-fprofile-arcs -ftest-coverage}";
89 +
90 + static const char *asm_options =
91 +--- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200
92 ++++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200
93 @@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
94 DEFPARAM (PARAM_SSP_BUFFER_SIZE,
95 "ssp-buffer-size",
96
97
98
99 1.2 src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch?rev=1.2&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch?rev=1.2&content-type=text/plain
103 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch?r1=1.1&r2=1.2
104
105 Index: 55_all_extra-options.patch
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch,v
108 retrieving revision 1.1
109 retrieving revision 1.2
110 diff -u -r1.1 -r1.2
111 --- 55_all_extra-options.patch 25 Jan 2018 21:20:43 -0000 1.1
112 +++ 55_all_extra-options.patch 3 May 2018 10:47:18 -0000 1.2
113 @@ -42,7 +42,7 @@
114 #endif
115 #endif
116
117 -+#define STACK_CHECK_SPEC "%{fstack-check|fstack-check=*:;: -fstack-check} "
118 ++#define STACK_CHECK_SPEC ""
119 +#ifdef EXTRA_OPTIONS
120 +#define LINK_NOW_SPEC "%{!nonow:-z now} "
121 +#else
122
123
124
125 1.4 src/patchsets/gcc/7.3.0/gentoo/README.history
126
127 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history?rev=1.4&view=markup
128 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history?rev=1.4&content-type=text/plain
129 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history?r1=1.3&r2=1.4
130
131 Index: README.history
132 ===================================================================
133 RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history,v
134 retrieving revision 1.3
135 retrieving revision 1.4
136 diff -u -r1.3 -r1.4
137 --- README.history 14 Apr 2018 12:28:33 -0000 1.3
138 +++ README.history 3 May 2018 10:47:18 -0000 1.4
139 @@ -1,3 +1,6 @@
140 +1.3 03 Maj 2018
141 + U 13_all_default-ssp-fix.patch
142 + U 55_all_extra-options.patch
143 1.2 14 Apr 2018
144 + 92_all_sh-drop-sysroot-suffix.patch
145 1.1 11 Feb 2018