1 |
vapier 15/03/31 06:19:50 |
2 |
|
3 |
Modified: README.history |
4 |
Added: |
5 |
93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch |
6 |
Log: |
7 |
backport fix from upstream for bconfig.h/config.h parallel build issues #463796 #487398 #545010 |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 src/patchsets/gcc/4.8.4/gentoo/README.history |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.4/gentoo/README.history?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.4/gentoo/README.history?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.4/gentoo/README.history?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: README.history |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.8.4/gentoo/README.history,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- README.history 21 Feb 2015 17:30:47 -0000 1.4 |
23 |
+++ README.history 31 Mar 2015 06:19:50 -0000 1.5 |
24 |
@@ -1,3 +1,6 @@ |
25 |
+1.4 30 Mar 2015 |
26 |
+ + 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch |
27 |
+ |
28 |
1.3 21 Feb 2015 |
29 |
+ 94_all_gcc48_alpha_bootstrap.patch |
30 |
|
31 |
|
32 |
|
33 |
|
34 |
1.1 src/patchsets/gcc/4.8.4/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch |
35 |
|
36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.4/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?rev=1.1&view=markup |
37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.8.4/gentoo/93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch?rev=1.1&content-type=text/plain |
38 |
|
39 |
Index: 93_all_gcc-4.8-config.h-bconfig.h-parallel-PR57125-PR61899.patch |
40 |
=================================================================== |
41 |
https://gcc.gnu.org/ml/gcc-patches/2014-11/msg03092.html |
42 |
https://gcc.gnu.org/PR57125 |
43 |
https://gcc.gnu.org/PR61899 |
44 |
https://bugs.gentoo.org/463796 |
45 |
https://bugs.gentoo.org/487398 |
46 |
https://bugs.gentoo.org/545010 |
47 |
|
48 |
fix parallel build issues around config.h/bconfig.h inclusion |
49 |
|
50 |
note: this also includes: |
51 |
commit ea38f4be892b22b61a540a102bed374ddb381b9a |
52 |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202894 138bc75d-0d04-0410-961f-82ee72b054a4 |
53 |
which adds to-wrapper.o to ALL_HOST_BACKEND_OBJS |
54 |
|
55 |
From ed89620f0e3de714864805f5d29dbab0341a1746 Mon Sep 17 00:00:00 2001 |
56 |
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> |
57 |
Date: Wed, 3 Dec 2014 16:44:27 +0000 |
58 |
Subject: [PATCH] Fix building of gengtype |
59 |
|
60 |
Found bootstrap failures even with this patch (dunno what changed on my box |
61 |
that I started getting these last night, make has not changed), that time |
62 |
with errors.o and gcc-ar.o. |
63 |
The generated headers are solved these days in automatic dependencies world |
64 |
through |
65 |
# In order for parallel make to really start compiling the expensive |
66 |
# objects from $(OBJS) as early as possible, build all their |
67 |
# prerequisites strictly before all objects. |
68 |
$(ALL_HOST_OBJS) : | $(generated_files) |
69 |
and build/*.o have explicit dependencies. |
70 |
I've tried to compare $(ALL_HOST_OBJS) on my box with all *.o */*.o files |
71 |
I had in stage3 directory, and besides build/*.o, I found: |
72 |
|
73 |
crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o crtfastmath.o crtprec32.o crtprec64.o crtprec80.o |
74 |
errors.o gcc-ar.o gcc-nm.o gcc-ranlib.o gengtype-lex.o gengtype.o gengtype-parse.o gengtype-state.o |
75 |
|
76 |
not being listed in ALL_HOST_OBJS. The crt*.o files come from libgcc build |
77 |
and thus are ok, the rest I've tried to handle in the following updated |
78 |
patch. If the #define GENERATOR_FILE inside of the 5 files is too ugly, |
79 |
another alternative might be to define both -DHOST_GENERATOR_FILE -DGENERATOR_FILE |
80 |
in Makefile.in and don't error in config.h if GENERATOR_FILE is defined, |
81 |
if HOST_GENERATOR_FILE is also defined. |
82 |
|
83 |
2014-12-03 Jakub Jelinek <jakub@××××××.com> |
84 |
|
85 |
* Makefile.in (ALL_HOST_BACKEND_OBJS): Add $(GENGTYPE_OBJS), |
86 |
gcc-ar.o, gcc-nm.o and gcc-ranlib.o. |
87 |
(GENGTYPE_OBJS): New. |
88 |
(gengtype-lex.o, gengtype-parse.o, gengtype-state.o, gengtype.o): |
89 |
Remove explicit dependencies. |
90 |
(CFLAGS-gengtype-lex.o, CFLAGS-gengtype-parse.o, |
91 |
CFLAGS-gengtype-state.o, CFLAGS-gengtype.o): Add -DHOST_GENERATOR_FILE |
92 |
instead of -DGENERATOR_FILE. |
93 |
(CFLAGS-errors.o): New. |
94 |
* gengtype.c: Instead of testing GENERATOR_FILE define, test |
95 |
HOST_GENERATOR_FILE. If defined, include config.h and define |
96 |
GENERATOR_FILE afterwards, otherwise include bconfig.h. |
97 |
* gengtype-parse.c: Likewise. |
98 |
* gengtype-state.c: Likewise. |
99 |
* gengtype-lex.l: Likewise. |
100 |
* errors.c: Likewise. |
101 |
|
102 |
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218325 138bc75d-0d04-0410-961f-82ee72b054a4 |
103 |
--- |
104 |
gcc/ChangeLog | 75 ++++++++++++++++++++++++++++++++-------------------- |
105 |
gcc/Makefile.in | 20 +++++++------- |
106 |
gcc/errors.c | 7 ++--- |
107 |
gcc/gengtype-lex.l | 7 ++--- |
108 |
gcc/gengtype-parse.c | 7 ++--- |
109 |
gcc/gengtype-state.c | 7 ++--- |
110 |
gcc/gengtype.c | 7 ++--- |
111 |
7 files changed, 77 insertions(+), 53 deletions(-) |
112 |
|
113 |
diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
114 |
index 204bd85..3820d0b 100644 |
115 |
--- a/gcc/Makefile.in |
116 |
+++ b/gcc/Makefile.in |
117 |
@@ -1509,6 +1509,7 @@ ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS)) |
118 |
ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \ |
119 |
$(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \ |
120 |
- $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) |
121 |
+ $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \ |
122 |
+ lto-wrapper.o $(GENGTYPE_OBJS) gcc-ar.o gcc-nm.o gcc-ranlib.o |
123 |
|
124 |
# This lists all host object files, whether they are included in this |
125 |
# compilation or not. |
126 |
@@ -2484,31 +2485,32 @@ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def |
127 |
# on BCONFIG_H. For the build objects, add -DGENERATOR_FILE manually, |
128 |
# the build-%: rule doesn't apply to them. |
129 |
|
130 |
+GENGTYPE_OBJS = gengtype.o gengtype-parse.o gengtype-state.o \ |
131 |
+ gengtype-lex.o errors.o |
132 |
+ |
133 |
gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) |
134 |
-gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) |
135 |
-CFLAGS-gengtype-lex.o += -DGENERATOR_FILE |
136 |
+CFLAGS-gengtype-lex.o += -DHOST_GENERATOR_FILE |
137 |
build/gengtype-lex.o: $(BCONFIG_H) |
138 |
|
139 |
gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \ |
140 |
$(SYSTEM_H) |
141 |
-gengtype-parse.o: $(CONFIG_H) |
142 |
-CFLAGS-gengtype-parse.o += -DGENERATOR_FILE |
143 |
+CFLAGS-gengtype-parse.o += -DHOST_GENERATOR_FILE |
144 |
build/gengtype-parse.o: $(BCONFIG_H) |
145 |
|
146 |
gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ |
147 |
gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ |
148 |
$(XREGEX_H) |
149 |
-gengtype-state.o: $(CONFIG_H) |
150 |
-CFLAGS-gengtype-state.o += -DGENERATOR_FILE |
151 |
+CFLAGS-gengtype-state.o += -DHOST_GENERATOR_FILE |
152 |
build/gengtype-state.o: $(BCONFIG_H) |
153 |
|
154 |
gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h \ |
155 |
rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \ |
156 |
$(OBSTACK_H) $(XREGEX_H) |
157 |
-gengtype.o: $(CONFIG_H) |
158 |
-CFLAGS-gengtype.o += -DGENERATOR_FILE |
159 |
+CFLAGS-gengtype.o += -DHOST_GENERATOR_FILE |
160 |
build/gengtype.o: $(BCONFIG_H) |
161 |
|
162 |
+CFLAGS-errors.o += -DHOST_GENERATOR_FILE |
163 |
+ |
164 |
build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \ |
165 |
errors.h $(READ_MD_H) |
166 |
build/genmodes.o : genmodes.c $(BCONFIG_H) $(SYSTEM_H) errors.h \ |
167 |
diff --git a/gcc/errors.c b/gcc/errors.c |
168 |
index be38b1f..a6a30fe 100644 |
169 |
--- a/gcc/errors.c |
170 |
+++ b/gcc/errors.c |
171 |
@@ -21,10 +21,11 @@ along with GCC; see the file COPYING3. If not see |
172 |
in the generator programs; the compiler has a more elaborate suite |
173 |
of diagnostic printers, found in diagnostic.c. */ |
174 |
|
175 |
-#ifdef GENERATOR_FILE |
176 |
-#include "bconfig.h" |
177 |
-#else |
178 |
+#ifdef HOST_GENERATOR_FILE |
179 |
#include "config.h" |
180 |
+#define GENERATOR_FILE 1 |
181 |
+#else |
182 |
+#include "bconfig.h" |
183 |
#endif |
184 |
#include "system.h" |
185 |
#include "errors.h" |
186 |
diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l |
187 |
index 5e12885..0866603 100644 |
188 |
--- a/gcc/gengtype-lex.l |
189 |
+++ b/gcc/gengtype-lex.l |
190 |
@@ -21,10 +21,11 @@ along with GCC; see the file COPYING3. If not see |
191 |
%option noinput |
192 |
|
193 |
%{ |
194 |
-#ifdef GENERATOR_FILE |
195 |
-#include "bconfig.h" |
196 |
-#else |
197 |
+#ifdef HOST_GENERATOR_FILE |
198 |
#include "config.h" |
199 |
+#define GENERATOR_FILE 1 |
200 |
+#else |
201 |
+#include "bconfig.h" |
202 |
#endif |
203 |
#include "system.h" |
204 |
|
205 |
diff --git a/gcc/gengtype-parse.c b/gcc/gengtype-parse.c |
206 |
index 0f11cec..87b6917 100644 |
207 |
--- a/gcc/gengtype-parse.c |
208 |
+++ b/gcc/gengtype-parse.c |
209 |
@@ -17,10 +17,11 @@ |
210 |
along with GCC; see the file COPYING3. If not see |
211 |
<http://www.gnu.org/licenses/>. */ |
212 |
|
213 |
-#ifdef GENERATOR_FILE |
214 |
-#include "bconfig.h" |
215 |
-#else |
216 |
+#ifdef HOST_GENERATOR_FILE |
217 |
#include "config.h" |
218 |
+#define GENERATOR_FILE 1 |
219 |
+#else |
220 |
+#include "bconfig.h" |
221 |
#endif |
222 |
#include "system.h" |
223 |
#include "gengtype.h" |
224 |
diff --git a/gcc/gengtype-state.c b/gcc/gengtype-state.c |
225 |
index 5b7017f..7634f74 100644 |
226 |
--- a/gcc/gengtype-state.c |
227 |
+++ b/gcc/gengtype-state.c |
228 |
@@ -23,10 +23,11 @@ |
229 |
and Basile Starynkevitch <basile@×××××××××××××.net> |
230 |
*/ |
231 |
|
232 |
-#ifdef GENERATOR_FILE |
233 |
-#include "bconfig.h" |
234 |
-#else |
235 |
+#ifdef HOST_GENERATOR_FILE |
236 |
#include "config.h" |
237 |
+#define GENERATOR_FILE 1 |
238 |
+#else |
239 |
+#include "bconfig.h" |
240 |
#endif |
241 |
#include "system.h" |
242 |
#include "errors.h" /* For fatal. */ |
243 |
diff --git a/gcc/gengtype.c b/gcc/gengtype.c |
244 |
index 2dc857e..39d2918 100644 |
245 |
--- a/gcc/gengtype.c |
246 |
+++ b/gcc/gengtype.c |
247 |
@@ -17,10 +17,11 @@ |
248 |
along with GCC; see the file COPYING3. If not see |
249 |
<http://www.gnu.org/licenses/>. */ |
250 |
|
251 |
-#ifdef GENERATOR_FILE |
252 |
-#include "bconfig.h" |
253 |
-#else |
254 |
+#ifdef HOST_GENERATOR_FILE |
255 |
#include "config.h" |
256 |
+#define GENERATOR_FILE 1 |
257 |
+#else |
258 |
+#include "bconfig.h" |
259 |
#endif |
260 |
#include "system.h" |
261 |
#include "errors.h" /* for fatal */ |
262 |
-- |
263 |
2.3.4 |