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