Allow returning something of type void in a function that returns void
[delight/core.git] / patches / patch-toplev-4.0.x
blob5dee3c2f5ce6832177ef30545e8e932ce9c1e4c9
1 diff -c gcc-4.0.3-orig/Makefile.def gcc-4.0.3/Makefile.def
2 *** gcc-4.0.3-orig/Makefile.def Thu Oct 20 07:55:29 2005
3 --- gcc-4.0.3/Makefile.def      Fri Nov 10 15:28:57 2006
4 ***************
5 *** 134,139 ****
6 --- 134,140 ----
7   target_modules = { module= qthreads; };
8   target_modules = { module= rda; };
9   target_modules = { module= libada; };
10 + target_modules = { module= libphobos; };
11   
12   // These are (some of) the make targets to be done in each subdirectory.
13   // Not all; these are the ones which don't have special options.
14 diff -c gcc-4.0.3-orig/Makefile.in gcc-4.0.3/Makefile.in
15 *** gcc-4.0.3-orig/Makefile.in  Thu Oct 20 07:55:29 2005
16 --- gcc-4.0.3/Makefile.in       Fri Nov 10 15:34:15 2006
17 ***************
18 *** 243,249 ****
19   CC_FOR_BUILD = @CC_FOR_BUILD@
20   CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
21   
22 ! CXX_FOR_BUILD = $(CXX)
23   
24   # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
25   # here so that they can be overridden by Makefile fragments.
26 --- 243,249 ----
27   CC_FOR_BUILD = @CC_FOR_BUILD@
28   CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
29   
30 ! CXX_FOR_BUILD = @CXX_FOR_BUILD@
31   
32   # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
33   # here so that they can be overridden by Makefile fragments.
34 ***************
35 *** 735,741 ****
36       maybe-configure-target-boehm-gc \
37       maybe-configure-target-qthreads \
38       maybe-configure-target-rda \
39 !     maybe-configure-target-libada
40   
41   # The target built for a native non-bootstrap build.
42   .PHONY: all
43 --- 735,742 ----
44       maybe-configure-target-boehm-gc \
45       maybe-configure-target-qthreads \
46       maybe-configure-target-rda \
47 !     maybe-configure-target-libada \
48 !     maybe-configure-target-libphobos
49   
50   # The target built for a native non-bootstrap build.
51   .PHONY: all
52 ***************
53 *** 837,843 ****
54       maybe-all-target-boehm-gc \
55       maybe-all-target-qthreads \
56       maybe-all-target-rda \
57 !     maybe-all-target-libada
58   
59   # Do a target for all the subdirectories.  A ``make do-X'' will do a
60   # ``make X'' in all subdirectories (because, in general, there is a
61 --- 838,845 ----
62       maybe-all-target-boehm-gc \
63       maybe-all-target-qthreads \
64       maybe-all-target-rda \
65 !     maybe-all-target-libada \
66 !     maybe-all-target-libphobos
67   
68   # Do a target for all the subdirectories.  A ``make do-X'' will do a
69   # ``make X'' in all subdirectories (because, in general, there is a
70 ***************
71 *** 935,941 ****
72       maybe-info-target-boehm-gc \
73       maybe-info-target-qthreads \
74       maybe-info-target-rda \
75 !     maybe-info-target-libada
76   
77   .PHONY: do-dvi
78   do-dvi: unstage dvi-host dvi-target stage
79 --- 937,944 ----
80       maybe-info-target-boehm-gc \
81       maybe-info-target-qthreads \
82       maybe-info-target-rda \
83 !     maybe-info-target-libada \
84 !     maybe-info-target-libphobos
85   
86   .PHONY: do-dvi
87   do-dvi: unstage dvi-host dvi-target stage
88 ***************
89 *** 1028,1034 ****
90       maybe-dvi-target-boehm-gc \
91       maybe-dvi-target-qthreads \
92       maybe-dvi-target-rda \
93 !     maybe-dvi-target-libada
94   
95   .PHONY: do-html
96   do-html: unstage html-host html-target stage
97 --- 1031,1038 ----
98       maybe-dvi-target-boehm-gc \
99       maybe-dvi-target-qthreads \
100       maybe-dvi-target-rda \
101 !     maybe-dvi-target-libada \
102 !     maybe-dvi-target-libphobos
103   
104   .PHONY: do-html
105   do-html: unstage html-host html-target stage
106 ***************
107 *** 1121,1127 ****
108       maybe-html-target-boehm-gc \
109       maybe-html-target-qthreads \
110       maybe-html-target-rda \
111 !     maybe-html-target-libada
112   
113   .PHONY: do-TAGS
114   do-TAGS: unstage TAGS-host TAGS-target stage
115 --- 1125,1132 ----
116       maybe-html-target-boehm-gc \
117       maybe-html-target-qthreads \
118       maybe-html-target-rda \
119 !     maybe-html-target-libada \
120 !     maybe-html-target-libphobos
121   
122   .PHONY: do-TAGS
123   do-TAGS: unstage TAGS-host TAGS-target stage
124 ***************
125 *** 1214,1220 ****
126       maybe-TAGS-target-boehm-gc \
127       maybe-TAGS-target-qthreads \
128       maybe-TAGS-target-rda \
129 !     maybe-TAGS-target-libada
130   
131   .PHONY: do-install-info
132   do-install-info: unstage install-info-host install-info-target stage
133 --- 1219,1226 ----
134       maybe-TAGS-target-boehm-gc \
135       maybe-TAGS-target-qthreads \
136       maybe-TAGS-target-rda \
137 !     maybe-TAGS-target-libada \
138 !     maybe-TAGS-target-libphobos
139   
140   .PHONY: do-install-info
141   do-install-info: unstage install-info-host install-info-target stage
142 ***************
143 *** 1307,1313 ****
144       maybe-install-info-target-boehm-gc \
145       maybe-install-info-target-qthreads \
146       maybe-install-info-target-rda \
147 !     maybe-install-info-target-libada
148   
149   .PHONY: do-installcheck
150   do-installcheck: unstage installcheck-host installcheck-target stage
151 --- 1313,1320 ----
152       maybe-install-info-target-boehm-gc \
153       maybe-install-info-target-qthreads \
154       maybe-install-info-target-rda \
155 !     maybe-install-info-target-libada \
156 !     maybe-install-info-target-libphobos
157   
158   .PHONY: do-installcheck
159   do-installcheck: unstage installcheck-host installcheck-target stage
160 ***************
161 *** 1400,1406 ****
162       maybe-installcheck-target-boehm-gc \
163       maybe-installcheck-target-qthreads \
164       maybe-installcheck-target-rda \
165 !     maybe-installcheck-target-libada
166   
167   .PHONY: do-mostlyclean
168   do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
169 --- 1407,1414 ----
170       maybe-installcheck-target-boehm-gc \
171       maybe-installcheck-target-qthreads \
172       maybe-installcheck-target-rda \
173 !     maybe-installcheck-target-libada \
174 !     maybe-installcheck-target-libphobos
175   
176   .PHONY: do-mostlyclean
177   do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
178 ***************
179 *** 1493,1499 ****
180       maybe-mostlyclean-target-boehm-gc \
181       maybe-mostlyclean-target-qthreads \
182       maybe-mostlyclean-target-rda \
183 !     maybe-mostlyclean-target-libada
184   
185   .PHONY: do-clean
186   do-clean: unstage clean-host clean-target stage
187 --- 1501,1508 ----
188       maybe-mostlyclean-target-boehm-gc \
189       maybe-mostlyclean-target-qthreads \
190       maybe-mostlyclean-target-rda \
191 !     maybe-mostlyclean-target-libada \
192 !     maybe-mostlyclean-target-libphobos
193   
194   .PHONY: do-clean
195   do-clean: unstage clean-host clean-target stage
196 ***************
197 *** 1586,1592 ****
198       maybe-clean-target-boehm-gc \
199       maybe-clean-target-qthreads \
200       maybe-clean-target-rda \
201 !     maybe-clean-target-libada
202   
203   .PHONY: do-distclean
204   do-distclean: unstage distclean-host distclean-target stage
205 --- 1595,1602 ----
206       maybe-clean-target-boehm-gc \
207       maybe-clean-target-qthreads \
208       maybe-clean-target-rda \
209 !     maybe-clean-target-libada \
210 !     maybe-clean-target-libphobos
211   
212   .PHONY: do-distclean
213   do-distclean: unstage distclean-host distclean-target stage
214 ***************
215 *** 1679,1685 ****
216       maybe-distclean-target-boehm-gc \
217       maybe-distclean-target-qthreads \
218       maybe-distclean-target-rda \
219 !     maybe-distclean-target-libada
220   
221   .PHONY: do-maintainer-clean
222   do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
223 --- 1689,1696 ----
224       maybe-distclean-target-boehm-gc \
225       maybe-distclean-target-qthreads \
226       maybe-distclean-target-rda \
227 !     maybe-distclean-target-libada \
228 !     maybe-distclean-target-libphobos
229   
230   .PHONY: do-maintainer-clean
231   do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
232 ***************
233 *** 1772,1778 ****
234       maybe-maintainer-clean-target-boehm-gc \
235       maybe-maintainer-clean-target-qthreads \
236       maybe-maintainer-clean-target-rda \
237 !     maybe-maintainer-clean-target-libada
238   
239   
240   # Here are the targets which correspond to the do-X targets.
241 --- 1783,1790 ----
242       maybe-maintainer-clean-target-boehm-gc \
243       maybe-maintainer-clean-target-qthreads \
244       maybe-maintainer-clean-target-rda \
245 !     maybe-maintainer-clean-target-libada \
246 !     maybe-maintainer-clean-target-libphobos
247   
248   
249   # Here are the targets which correspond to the do-X targets.
250 ***************
251 *** 1921,1927 ****
252       maybe-check-target-boehm-gc \
253       maybe-check-target-qthreads \
254       maybe-check-target-rda \
255 !     maybe-check-target-libada stage
256   
257   # Automated reporting of test results.
258   
259 --- 1933,1940 ----
260       maybe-check-target-boehm-gc \
261       maybe-check-target-qthreads \
262       maybe-check-target-rda \
263 !     maybe-check-target-libada \
264 !     maybe-check-target-libphobos stage
265   
266   # Automated reporting of test results.
267   
268 ***************
269 *** 2105,2111 ****
270       maybe-install-target-boehm-gc \
271       maybe-install-target-qthreads \
272       maybe-install-target-rda \
273 !     maybe-install-target-libada
274   
275   uninstall:
276         @echo "the uninstall target is not supported in this tree"
277 --- 2118,2125 ----
278       maybe-install-target-boehm-gc \
279       maybe-install-target-qthreads \
280       maybe-install-target-rda \
281 !     maybe-install-target-libada \
282 !     maybe-install-target-libphobos
283   
284   uninstall:
285         @echo "the uninstall target is not supported in this tree"
286 ***************
287 *** 30361,30366 ****
288 --- 30375,30722 ----
289   @endif target-libada
290   
291   
292 + .PHONY: configure-target-libphobos maybe-configure-target-libphobos
293 + maybe-configure-target-libphobos:
294 + @if target-libphobos
295 + maybe-configure-target-libphobos: configure-target-libphobos
297 + # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
298 + $(TARGET_SUBDIR)/libphobos/multilib.out: multilib.out
299 +       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos ; \
300 +       rm -f $(TARGET_SUBDIR)/libphobos/Makefile || : ; \
301 +       cp multilib.out $(TARGET_SUBDIR)/libphobos/multilib.out
303 + configure-target-libphobos: $(TARGET_SUBDIR)/libphobos/multilib.out
304 +       @test ! -f $(TARGET_SUBDIR)/libphobos/Makefile || exit 0; \
305 +       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos ; \
306 +       r=`${PWD_COMMAND}`; export r; \
307 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
308 +       $(SET_LIB_PATH) \
309 +       $(NORMAL_TARGET_EXPORTS) \
310 +       echo Configuring in $(TARGET_SUBDIR)/libphobos; \
311 +       cd "$(TARGET_SUBDIR)/libphobos" || exit 1; \
312 +       case $(srcdir) in \
313 +         /* | [A-Za-z]:[\\/]*) \
314 +           topdir=$(srcdir) ;; \
315 +         *) \
316 +           case "$(TARGET_SUBDIR)" in \
317 +             .) topdir="../$(srcdir)" ;; \
318 +             *) topdir="../../$(srcdir)" ;; \
319 +           esac ;; \
320 +       esac; \
321 +         srcdiroption="--srcdir=$${topdir}/libphobos"; \
322 +         libsrcdir="$$s/libphobos"; \
323 +       rm -f no-such-file || : ; \
324 +       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
325 +         $(TARGET_CONFIGARGS) $${srcdiroption} \
326 +         --with-target-subdir="$(TARGET_SUBDIR)"  \
327 +         || exit 1
328 + @endif target-libphobos
330 + .PHONY: all-target-libphobos maybe-all-target-libphobos
331 + maybe-all-target-libphobos:
332 + @if target-libphobos
333 + TARGET-target-libphobos=all
334 + maybe-all-target-libphobos: all-target-libphobos
335 + all-target-libphobos: configure-target-libphobos
336 +       @r=`${PWD_COMMAND}`; export r; \
337 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
338 +       $(SET_LIB_PATH) \
339 +       $(NORMAL_TARGET_EXPORTS) \
340 +       (cd $(TARGET_SUBDIR)/libphobos && \
341 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libphobos))
342 + @endif target-libphobos
344 + .PHONY: check-target-libphobos maybe-check-target-libphobos
345 + maybe-check-target-libphobos:
346 + @if target-libphobos
347 + maybe-check-target-libphobos: check-target-libphobos
349 + check-target-libphobos:
350 +       @r=`${PWD_COMMAND}`; export r; \
351 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
352 +       $(SET_LIB_PATH) \
353 +       $(NORMAL_TARGET_EXPORTS) \
354 +       (cd $(TARGET_SUBDIR)/libphobos && \
355 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
357 + @endif target-libphobos
359 + .PHONY: install-target-libphobos maybe-install-target-libphobos
360 + maybe-install-target-libphobos:
361 + @if target-libphobos
362 + maybe-install-target-libphobos: install-target-libphobos
364 + install-target-libphobos: installdirs
365 +       @r=`${PWD_COMMAND}`; export r; \
366 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
367 +       $(SET_LIB_PATH) \
368 +       $(NORMAL_TARGET_EXPORTS) \
369 +       (cd $(TARGET_SUBDIR)/libphobos && \
370 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
372 + @endif target-libphobos
374 + # Other targets (info, dvi, etc.)
376 + .PHONY: maybe-info-target-libphobos info-target-libphobos
377 + maybe-info-target-libphobos:
378 + @if target-libphobos
379 + maybe-info-target-libphobos: info-target-libphobos
381 + info-target-libphobos: \
382 +     configure-target-libphobos 
383 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
384 +       r=`${PWD_COMMAND}`; export r; \
385 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
386 +       $(SET_LIB_PATH) \
387 +       $(NORMAL_TARGET_EXPORTS) \
388 +       echo "Doing info in $(TARGET_SUBDIR)/libphobos" ; \
389 +       for flag in $(EXTRA_TARGET_FLAGS); do \
390 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
391 +       done; \
392 +       (cd $(TARGET_SUBDIR)/libphobos && \
393 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
394 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
395 +                 "RANLIB=$${RANLIB}" \
396 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
397 +                  info) \
398 +         || exit 1
400 + @endif target-libphobos
402 + .PHONY: maybe-dvi-target-libphobos dvi-target-libphobos
403 + maybe-dvi-target-libphobos:
404 + @if target-libphobos
405 + maybe-dvi-target-libphobos: dvi-target-libphobos
407 + dvi-target-libphobos: \
408 +     configure-target-libphobos 
409 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
410 +       r=`${PWD_COMMAND}`; export r; \
411 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
412 +       $(SET_LIB_PATH) \
413 +       $(NORMAL_TARGET_EXPORTS) \
414 +       echo "Doing dvi in $(TARGET_SUBDIR)/libphobos" ; \
415 +       for flag in $(EXTRA_TARGET_FLAGS); do \
416 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
417 +       done; \
418 +       (cd $(TARGET_SUBDIR)/libphobos && \
419 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
420 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
421 +                 "RANLIB=$${RANLIB}" \
422 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
423 +                  dvi) \
424 +         || exit 1
426 + @endif target-libphobos
428 + .PHONY: maybe-html-target-libphobos html-target-libphobos
429 + maybe-html-target-libphobos:
430 + @if target-libphobos
431 + maybe-html-target-libphobos: html-target-libphobos
433 + html-target-libphobos: \
434 +     configure-target-libphobos 
435 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
436 +       r=`${PWD_COMMAND}`; export r; \
437 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
438 +       $(SET_LIB_PATH) \
439 +       $(NORMAL_TARGET_EXPORTS) \
440 +       echo "Doing html in $(TARGET_SUBDIR)/libphobos" ; \
441 +       for flag in $(EXTRA_TARGET_FLAGS); do \
442 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
443 +       done; \
444 +       (cd $(TARGET_SUBDIR)/libphobos && \
445 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
446 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
447 +                 "RANLIB=$${RANLIB}" \
448 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
449 +                  html) \
450 +         || exit 1
452 + @endif target-libphobos
454 + .PHONY: maybe-TAGS-target-libphobos TAGS-target-libphobos
455 + maybe-TAGS-target-libphobos:
456 + @if target-libphobos
457 + maybe-TAGS-target-libphobos: TAGS-target-libphobos
459 + TAGS-target-libphobos: \
460 +     configure-target-libphobos 
461 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
462 +       r=`${PWD_COMMAND}`; export r; \
463 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
464 +       $(SET_LIB_PATH) \
465 +       $(NORMAL_TARGET_EXPORTS) \
466 +       echo "Doing TAGS in $(TARGET_SUBDIR)/libphobos" ; \
467 +       for flag in $(EXTRA_TARGET_FLAGS); do \
468 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
469 +       done; \
470 +       (cd $(TARGET_SUBDIR)/libphobos && \
471 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
472 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
473 +                 "RANLIB=$${RANLIB}" \
474 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
475 +                  TAGS) \
476 +         || exit 1
478 + @endif target-libphobos
480 + .PHONY: maybe-install-info-target-libphobos install-info-target-libphobos
481 + maybe-install-info-target-libphobos:
482 + @if target-libphobos
483 + maybe-install-info-target-libphobos: install-info-target-libphobos
485 + install-info-target-libphobos: \
486 +     configure-target-libphobos \
487 +     info-target-libphobos 
488 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
489 +       r=`${PWD_COMMAND}`; export r; \
490 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
491 +       $(SET_LIB_PATH) \
492 +       $(NORMAL_TARGET_EXPORTS) \
493 +       echo "Doing install-info in $(TARGET_SUBDIR)/libphobos" ; \
494 +       for flag in $(EXTRA_TARGET_FLAGS); do \
495 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
496 +       done; \
497 +       (cd $(TARGET_SUBDIR)/libphobos && \
498 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
499 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
500 +                 "RANLIB=$${RANLIB}" \
501 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
502 +                  install-info) \
503 +         || exit 1
505 + @endif target-libphobos
507 + .PHONY: maybe-installcheck-target-libphobos installcheck-target-libphobos
508 + maybe-installcheck-target-libphobos:
509 + @if target-libphobos
510 + maybe-installcheck-target-libphobos: installcheck-target-libphobos
512 + installcheck-target-libphobos: \
513 +     configure-target-libphobos 
514 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
515 +       r=`${PWD_COMMAND}`; export r; \
516 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
517 +       $(SET_LIB_PATH) \
518 +       $(NORMAL_TARGET_EXPORTS) \
519 +       echo "Doing installcheck in $(TARGET_SUBDIR)/libphobos" ; \
520 +       for flag in $(EXTRA_TARGET_FLAGS); do \
521 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
522 +       done; \
523 +       (cd $(TARGET_SUBDIR)/libphobos && \
524 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
525 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
526 +                 "RANLIB=$${RANLIB}" \
527 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
528 +                  installcheck) \
529 +         || exit 1
531 + @endif target-libphobos
533 + .PHONY: maybe-mostlyclean-target-libphobos mostlyclean-target-libphobos
534 + maybe-mostlyclean-target-libphobos:
535 + @if target-libphobos
536 + maybe-mostlyclean-target-libphobos: mostlyclean-target-libphobos
538 + mostlyclean-target-libphobos: 
539 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
540 +       r=`${PWD_COMMAND}`; export r; \
541 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
542 +       $(SET_LIB_PATH) \
543 +       $(NORMAL_TARGET_EXPORTS) \
544 +       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libphobos" ; \
545 +       for flag in $(EXTRA_TARGET_FLAGS); do \
546 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
547 +       done; \
548 +       (cd $(TARGET_SUBDIR)/libphobos && \
549 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
550 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
551 +                 "RANLIB=$${RANLIB}" \
552 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
553 +                  mostlyclean) \
554 +         || exit 1
556 + @endif target-libphobos
558 + .PHONY: maybe-clean-target-libphobos clean-target-libphobos
559 + maybe-clean-target-libphobos:
560 + @if target-libphobos
561 + maybe-clean-target-libphobos: clean-target-libphobos
563 + clean-target-libphobos: 
564 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
565 +       r=`${PWD_COMMAND}`; export r; \
566 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
567 +       $(SET_LIB_PATH) \
568 +       $(NORMAL_TARGET_EXPORTS) \
569 +       echo "Doing clean in $(TARGET_SUBDIR)/libphobos" ; \
570 +       for flag in $(EXTRA_TARGET_FLAGS); do \
571 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
572 +       done; \
573 +       (cd $(TARGET_SUBDIR)/libphobos && \
574 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
575 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
576 +                 "RANLIB=$${RANLIB}" \
577 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
578 +                  clean) \
579 +         || exit 1
581 + @endif target-libphobos
583 + .PHONY: maybe-distclean-target-libphobos distclean-target-libphobos
584 + maybe-distclean-target-libphobos:
585 + @if target-libphobos
586 + maybe-distclean-target-libphobos: distclean-target-libphobos
588 + distclean-target-libphobos: 
589 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
590 +       r=`${PWD_COMMAND}`; export r; \
591 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
592 +       $(SET_LIB_PATH) \
593 +       $(NORMAL_TARGET_EXPORTS) \
594 +       echo "Doing distclean in $(TARGET_SUBDIR)/libphobos" ; \
595 +       for flag in $(EXTRA_TARGET_FLAGS); do \
596 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
597 +       done; \
598 +       (cd $(TARGET_SUBDIR)/libphobos && \
599 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
600 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
601 +                 "RANLIB=$${RANLIB}" \
602 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
603 +                  distclean) \
604 +         || exit 1
606 + @endif target-libphobos
608 + .PHONY: maybe-maintainer-clean-target-libphobos maintainer-clean-target-libphobos
609 + maybe-maintainer-clean-target-libphobos:
610 + @if target-libphobos
611 + maybe-maintainer-clean-target-libphobos: maintainer-clean-target-libphobos
613 + maintainer-clean-target-libphobos: 
614 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
615 +       r=`${PWD_COMMAND}`; export r; \
616 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
617 +       $(SET_LIB_PATH) \
618 +       $(NORMAL_TARGET_EXPORTS) \
619 +       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libphobos" ; \
620 +       for flag in $(EXTRA_TARGET_FLAGS); do \
621 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
622 +       done; \
623 +       (cd $(TARGET_SUBDIR)/libphobos && \
624 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
625 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
626 +                 "RANLIB=$${RANLIB}" \
627 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
628 +                  maintainer-clean) \
629 +         || exit 1
631 + @endif target-libphobos
634   
635   # ----------
636   # GCC module
637 ***************
638 *** 34964,34969 ****
639 --- 35320,35327 ----
640   
641   configure-target-libada: maybe-all-gcc
642   
643 + configure-target-libphobos: maybe-all-gcc
645   
646   
647   configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
648 diff -c gcc-4.0.3-orig/configure gcc-4.0.3/configure
649 *** gcc-4.0.3-orig/configure    Tue Sep 13 03:01:28 2005
650 --- gcc-4.0.3/configure Fri Nov 10 15:31:52 2006
651 ***************
652 *** 939,944 ****
653 --- 939,945 ----
654                 target-libgfortran \
655                 ${libgcj} \
656                 target-libobjc \
657 +               target-libphobos \
658                 target-libada"
659   
660   # these tools are built using the target libraries, and are intended to
661 ***************
662 *** 1781,1786 ****
663 --- 1782,1788 ----
664     CXXFLAGS=${CXXFLAGS-"-g -O2"}
665     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
666     CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
667 +   CXX_FOR_BUILD=${CXX_FOR_BUILD-c++}
668     CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
669     GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
670     GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
671 ***************
672 *** 1797,1802 ****
673 --- 1799,1805 ----
674     # This is all going to change when we autoconfiscate...
675   
676     CC_FOR_BUILD="\$(CC)"
677 +   CXX_FOR_BUILD="\$(CXX)"
678     GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
679     BUILD_PREFIX=
680     BUILD_PREFIX_1=loser-
681 ***************
682 *** 5143,5148 ****
683 --- 5146,5152 ----
684   s%@target_configargs@%$target_configargs%g
685   s%@target_configdirs@%$target_configdirs%g
686   s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
687 + s%@CXX_FOR_BUILD@%$CXX_FOR_BUILD%g
688   s%@config_shell@%$config_shell%g
689   s%@AR@%$AR%g
690   s%@ncn_cv_AR@%$ncn_cv_AR%g
691 diff -c gcc-4.0.3-orig/configure.in gcc-4.0.3/configure.in
692 *** gcc-4.0.3-orig/configure.in Tue Sep 13 03:01:28 2005
693 --- gcc-4.0.3/configure.in      Fri Nov 10 15:33:46 2006
694 ***************
695 *** 173,178 ****
696 --- 173,179 ----
697                 target-libgfortran \
698                 ${libgcj} \
699                 target-libobjc \
700 +               target-libphobos \
701                 target-libada"
702   
703   # these tools are built using the target libraries, and are intended to
704 ***************
705 *** 990,995 ****
706 --- 991,997 ----
707     CXXFLAGS=${CXXFLAGS-"-g -O2"}
708     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
709     CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
710 +   CXX_FOR_BUILD=${CXX_FOR_BUILD-c++}
711     CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
712     GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
713     GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
714 ***************
715 *** 1006,1011 ****
716 --- 1008,1014 ----
717     # This is all going to change when we autoconfiscate...
718   
719     CC_FOR_BUILD="\$(CC)"
720 +   CXX_FOR_BUILD="\$(CXX)"
721     GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
722     BUILD_PREFIX=
723     BUILD_PREFIX_1=loser-
724 ***************
725 *** 2172,2177 ****
726 --- 2175,2181 ----
727   
728   # Build tools.
729   AC_SUBST(CC_FOR_BUILD)
730 + AC_SUBST(CXX_FOR_BUILD)
731   AC_SUBST(config_shell)
732   
733   # Host tools.