patches/patch-toplev-3.4.x

   1 diff -c gcc-3.4.5-orig/Makefile.def gcc-3.4.5/Makefile.def
   2 *** gcc-3.4.5-orig/Makefile.def Wed Jan 14 15:09:37 2004
   3 --- gcc-3.4.5/Makefile.def      Fri Nov 10 15:42:37 2006
   4 ***************
   5 *** 116,121 ****
   6 --- 116,122 ----
   7   target_modules = { module= boehm-gc; };
   8   target_modules = { module= qthreads; };
   9   target_modules = { module= rda; };
  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-3.4.5-orig/Makefile.in gcc-3.4.5/Makefile.in
  15 *** gcc-3.4.5-orig/Makefile.in  Thu Sep 23 20:43:53 2004
  16 --- gcc-3.4.5/Makefile.in       Fri Nov 10 15:43:48 2006
  17 ***************
  18 *** 145,151 ****
  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 --- 145,151 ----
  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 *** 612,618 ****
  36       maybe-configure-target-zlib \
  37       maybe-configure-target-boehm-gc \
  38       maybe-configure-target-qthreads \
  39 !     maybe-configure-target-rda
  40
  41   # The target built for a native build.
  42   .PHONY: all.normal
  43 --- 612,619 ----
  44       maybe-configure-target-zlib \
  45       maybe-configure-target-boehm-gc \
  46       maybe-configure-target-qthreads \
  47 !     maybe-configure-target-rda \
  48 !     maybe-configure-target-libphobos
  49
  50   # The target built for a native build.
  51   .PHONY: all.normal
  52 ***************
  53 *** 701,707 ****
  54       maybe-all-target-zlib \
  55       maybe-all-target-boehm-gc \
  56       maybe-all-target-qthreads \
  57 !     maybe-all-target-rda
  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 --- 702,709 ----
  62       maybe-all-target-zlib \
  63       maybe-all-target-boehm-gc \
  64       maybe-all-target-qthreads \
  65 !     maybe-all-target-rda \
  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 *** 795,801 ****
  72       maybe-info-target-zlib \
  73       maybe-info-target-boehm-gc \
  74       maybe-info-target-qthreads \
  75 !     maybe-info-target-rda
  76
  77   # GCC, the eternal special case
  78   .PHONY: maybe-info-gcc info-gcc
  79 --- 797,804 ----
  80       maybe-info-target-zlib \
  81       maybe-info-target-boehm-gc \
  82       maybe-info-target-qthreads \
  83 !     maybe-info-target-rda \
  84 !     maybe-info-target-libphobos
  85
  86   # GCC, the eternal special case
  87   .PHONY: maybe-info-gcc info-gcc
  88 ***************
  89 *** 2583,2588 ****
  90 --- 2586,2613 ----
  91           || exit 1
  92
  93
  94 + .PHONY: maybe-info-target-libphobos info-target-libphobos
  95 + maybe-info-target-libphobos:
  96 +
  97 + info-target-libphobos: \
  98 +     configure-target-libphobos
  99 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 100 +       r=`${PWD_COMMAND}`; export r; \
 101 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 102 +       $(SET_LIB_PATH) \
 103 +       echo "Doing info in $(TARGET_SUBDIR)/libphobos" ; \
 104 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 105 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 106 +       done; \
 107 +       (cd $(TARGET_SUBDIR)/libphobos && \
 108 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 109 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 110 +                 "RANLIB=$${RANLIB}" \
 111 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 112 +                 info) \
 113 +         || exit 1
 114 +
 115 +
 116
 117   .PHONY: do-dvi
 118   do-dvi: dvi-host dvi-target
 119 ***************
 120 *** 2671,2677 ****
 121       maybe-dvi-target-zlib \
 122       maybe-dvi-target-boehm-gc \
 123       maybe-dvi-target-qthreads \
 124 !     maybe-dvi-target-rda
 125
 126   # GCC, the eternal special case
 127   .PHONY: maybe-dvi-gcc dvi-gcc
 128 --- 2696,2703 ----
 129       maybe-dvi-target-zlib \
 130       maybe-dvi-target-boehm-gc \
 131       maybe-dvi-target-qthreads \
 132 !     maybe-dvi-target-rda \
 133 !     maybe-dvi-target-libphobos
 134
 135   # GCC, the eternal special case
 136   .PHONY: maybe-dvi-gcc dvi-gcc
 137 ***************
 138 *** 4459,4464 ****
 139 --- 4485,4512 ----
 140           || exit 1
 141
 142
 143 + .PHONY: maybe-dvi-target-libphobos dvi-target-libphobos
 144 + maybe-dvi-target-libphobos:
 145 +
 146 + dvi-target-libphobos: \
 147 +     configure-target-libphobos
 148 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 149 +       r=`${PWD_COMMAND}`; export r; \
 150 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 151 +       $(SET_LIB_PATH) \
 152 +       echo "Doing dvi in $(TARGET_SUBDIR)/libphobos" ; \
 153 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 154 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 155 +       done; \
 156 +       (cd $(TARGET_SUBDIR)/libphobos && \
 157 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 158 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 159 +                 "RANLIB=$${RANLIB}" \
 160 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 161 +                 dvi) \
 162 +         || exit 1
 163 +
 164 +
 165
 166   .PHONY: do-TAGS
 167   do-TAGS: TAGS-host TAGS-target
 168 ***************
 169 *** 4547,4553 ****
 170       maybe-TAGS-target-zlib \
 171       maybe-TAGS-target-boehm-gc \
 172       maybe-TAGS-target-qthreads \
 173 !     maybe-TAGS-target-rda
 174
 175   # GCC, the eternal special case
 176   .PHONY: maybe-TAGS-gcc TAGS-gcc
 177 --- 4595,4602 ----
 178       maybe-TAGS-target-zlib \
 179       maybe-TAGS-target-boehm-gc \
 180       maybe-TAGS-target-qthreads \
 181 !     maybe-TAGS-target-rda \
 182 !     maybe-TAGS-target-libphobos
 183
 184   # GCC, the eternal special case
 185   .PHONY: maybe-TAGS-gcc TAGS-gcc
 186 ***************
 187 *** 6335,6340 ****
 188 --- 6384,6411 ----
 189           || exit 1
 190
 191
 192 + .PHONY: maybe-TAGS-target-libphobos TAGS-target-libphobos
 193 + maybe-TAGS-target-libphobos:
 194 +
 195 + TAGS-target-libphobos: \
 196 +     configure-target-libphobos
 197 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 198 +       r=`${PWD_COMMAND}`; export r; \
 199 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 200 +       $(SET_LIB_PATH) \
 201 +       echo "Doing TAGS in $(TARGET_SUBDIR)/libphobos" ; \
 202 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 203 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 204 +       done; \
 205 +       (cd $(TARGET_SUBDIR)/libphobos && \
 206 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 207 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 208 +                 "RANLIB=$${RANLIB}" \
 209 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 210 +                 TAGS) \
 211 +         || exit 1
 212 +
 213 +
 214
 215   .PHONY: do-install-info
 216   do-install-info: install-info-host install-info-target
 217 ***************
 218 *** 6423,6429 ****
 219       maybe-install-info-target-zlib \
 220       maybe-install-info-target-boehm-gc \
 221       maybe-install-info-target-qthreads \
 222 !     maybe-install-info-target-rda
 223
 224   # GCC, the eternal special case
 225   .PHONY: maybe-install-info-gcc install-info-gcc
 226 --- 6494,6501 ----
 227       maybe-install-info-target-zlib \
 228       maybe-install-info-target-boehm-gc \
 229       maybe-install-info-target-qthreads \
 230 !     maybe-install-info-target-rda \
 231 !     maybe-install-info-target-libphobos
 232
 233   # GCC, the eternal special case
 234   .PHONY: maybe-install-info-gcc install-info-gcc
 235 ***************
 236 *** 8292,8297 ****
 237 --- 8364,8392 ----
 238           || exit 1
 239
 240
 241 + .PHONY: maybe-install-info-target-libphobos install-info-target-libphobos
 242 + maybe-install-info-target-libphobos:
 243 +
 244 + install-info-target-libphobos: \
 245 +     configure-target-libphobos \
 246 +     info-target-libphobos
 247 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 248 +       r=`${PWD_COMMAND}`; export r; \
 249 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 250 +       $(SET_LIB_PATH) \
 251 +       echo "Doing install-info in $(TARGET_SUBDIR)/libphobos" ; \
 252 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 253 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 254 +       done; \
 255 +       (cd $(TARGET_SUBDIR)/libphobos && \
 256 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 257 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 258 +                 "RANLIB=$${RANLIB}" \
 259 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 260 +                 install-info) \
 261 +         || exit 1
 262 +
 263 +
 264
 265   .PHONY: do-installcheck
 266   do-installcheck: installcheck-host installcheck-target
 267 ***************
 268 *** 8380,8386 ****
 269       maybe-installcheck-target-zlib \
 270       maybe-installcheck-target-boehm-gc \
 271       maybe-installcheck-target-qthreads \
 272 !     maybe-installcheck-target-rda
 273
 274   # GCC, the eternal special case
 275   .PHONY: maybe-installcheck-gcc installcheck-gcc
 276 --- 8475,8482 ----
 277       maybe-installcheck-target-zlib \
 278       maybe-installcheck-target-boehm-gc \
 279       maybe-installcheck-target-qthreads \
 280 !     maybe-installcheck-target-rda \
 281 !     maybe-installcheck-target-libphobos
 282
 283   # GCC, the eternal special case
 284   .PHONY: maybe-installcheck-gcc installcheck-gcc
 285 ***************
 286 *** 10168,10173 ****
 287 --- 10264,10291 ----
 288           || exit 1
 289
 290
 291 + .PHONY: maybe-installcheck-target-libphobos installcheck-target-libphobos
 292 + maybe-installcheck-target-libphobos:
 293 +
 294 + installcheck-target-libphobos: \
 295 +     configure-target-libphobos
 296 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 297 +       r=`${PWD_COMMAND}`; export r; \
 298 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 299 +       $(SET_LIB_PATH) \
 300 +       echo "Doing installcheck in $(TARGET_SUBDIR)/libphobos" ; \
 301 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 302 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 303 +       done; \
 304 +       (cd $(TARGET_SUBDIR)/libphobos && \
 305 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 306 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 307 +                 "RANLIB=$${RANLIB}" \
 308 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 309 +                 installcheck) \
 310 +         || exit 1
 311 +
 312 +
 313
 314   .PHONY: do-mostlyclean
 315   do-mostlyclean: mostlyclean-host mostlyclean-target
 316 ***************
 317 *** 10256,10262 ****
 318       maybe-mostlyclean-target-zlib \
 319       maybe-mostlyclean-target-boehm-gc \
 320       maybe-mostlyclean-target-qthreads \
 321 !     maybe-mostlyclean-target-rda
 322
 323   # GCC, the eternal special case
 324   .PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
 325 --- 10374,10381 ----
 326       maybe-mostlyclean-target-zlib \
 327       maybe-mostlyclean-target-boehm-gc \
 328       maybe-mostlyclean-target-qthreads \
 329 !     maybe-mostlyclean-target-rda \
 330 !     maybe-mostlyclean-target-libphobos
 331
 332   # GCC, the eternal special case
 333   .PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
 334 ***************
 335 *** 11921,11926 ****
 336 --- 12040,12066 ----
 337           || exit 1
 338
 339
 340 + .PHONY: maybe-mostlyclean-target-libphobos mostlyclean-target-libphobos
 341 + maybe-mostlyclean-target-libphobos:
 342 +
 343 + mostlyclean-target-libphobos:
 344 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 345 +       r=`${PWD_COMMAND}`; export r; \
 346 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 347 +       $(SET_LIB_PATH) \
 348 +       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libphobos" ; \
 349 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 350 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 351 +       done; \
 352 +       (cd $(TARGET_SUBDIR)/libphobos && \
 353 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 354 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 355 +                 "RANLIB=$${RANLIB}" \
 356 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 357 +                 mostlyclean) \
 358 +         || exit 1
 359 +
 360 +
 361
 362   .PHONY: do-clean
 363   do-clean: clean-host clean-target
 364 ***************
 365 *** 12009,12015 ****
 366       maybe-clean-target-zlib \
 367       maybe-clean-target-boehm-gc \
 368       maybe-clean-target-qthreads \
 369 !     maybe-clean-target-rda
 370
 371   # GCC, the eternal special case
 372   .PHONY: maybe-clean-gcc clean-gcc
 373 --- 12149,12156 ----
 374       maybe-clean-target-zlib \
 375       maybe-clean-target-boehm-gc \
 376       maybe-clean-target-qthreads \
 377 !     maybe-clean-target-rda \
 378 !     maybe-clean-target-libphobos
 379
 380   # GCC, the eternal special case
 381   .PHONY: maybe-clean-gcc clean-gcc
 382 ***************
 383 *** 13688,13693 ****
 384 --- 13829,13855 ----
 385           || exit 1
 386
 387
 388 + .PHONY: maybe-clean-target-libphobos clean-target-libphobos
 389 + maybe-clean-target-libphobos:
 390 +
 391 + clean-target-libphobos:
 392 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 393 +       r=`${PWD_COMMAND}`; export r; \
 394 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 395 +       $(SET_LIB_PATH) \
 396 +       echo "Doing clean in $(TARGET_SUBDIR)/libphobos" ; \
 397 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 398 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 399 +       done; \
 400 +       (cd $(TARGET_SUBDIR)/libphobos && \
 401 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 402 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 403 +                 "RANLIB=$${RANLIB}" \
 404 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 405 +                 clean) \
 406 +         || exit 1
 407 +
 408 +
 409
 410   .PHONY: do-distclean
 411   do-distclean: distclean-host distclean-target
 412 ***************
 413 *** 13776,13782 ****
 414       maybe-distclean-target-zlib \
 415       maybe-distclean-target-boehm-gc \
 416       maybe-distclean-target-qthreads \
 417 !     maybe-distclean-target-rda
 418
 419   # GCC, the eternal special case
 420   .PHONY: maybe-distclean-gcc distclean-gcc
 421 --- 13938,13945 ----
 422       maybe-distclean-target-zlib \
 423       maybe-distclean-target-boehm-gc \
 424       maybe-distclean-target-qthreads \
 425 !     maybe-distclean-target-rda \
 426 !     maybe-distclean-target-libphobos
 427
 428   # GCC, the eternal special case
 429   .PHONY: maybe-distclean-gcc distclean-gcc
 430 ***************
 431 *** 15455,15460 ****
 432 --- 15618,15644 ----
 433           || exit 1
 434
 435
 436 + .PHONY: maybe-distclean-target-libphobos distclean-target-libphobos
 437 + maybe-distclean-target-libphobos:
 438 +
 439 + distclean-target-libphobos:
 440 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 441 +       r=`${PWD_COMMAND}`; export r; \
 442 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 443 +       $(SET_LIB_PATH) \
 444 +       echo "Doing distclean in $(TARGET_SUBDIR)/libphobos" ; \
 445 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 446 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 447 +       done; \
 448 +       (cd $(TARGET_SUBDIR)/libphobos && \
 449 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 450 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 451 +                 "RANLIB=$${RANLIB}" \
 452 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 453 +                 distclean) \
 454 +         || exit 1
 455 +
 456 +
 457
 458   .PHONY: do-maintainer-clean
 459   do-maintainer-clean: maintainer-clean-host maintainer-clean-target
 460 ***************
 461 *** 15543,15549 ****
 462       maybe-maintainer-clean-target-zlib \
 463       maybe-maintainer-clean-target-boehm-gc \
 464       maybe-maintainer-clean-target-qthreads \
 465 !     maybe-maintainer-clean-target-rda
 466
 467   # GCC, the eternal special case
 468   .PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
 469 --- 15727,15734 ----
 470       maybe-maintainer-clean-target-zlib \
 471       maybe-maintainer-clean-target-boehm-gc \
 472       maybe-maintainer-clean-target-qthreads \
 473 !     maybe-maintainer-clean-target-rda \
 474 !     maybe-maintainer-clean-target-libphobos
 475
 476   # GCC, the eternal special case
 477   .PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
 478 ***************
 479 *** 17222,17227 ****
 480 --- 17407,17433 ----
 481           || exit 1
 482
 483
 484 + .PHONY: maybe-maintainer-clean-target-libphobos maintainer-clean-target-libphobos
 485 + maybe-maintainer-clean-target-libphobos:
 486 +
 487 + maintainer-clean-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 +       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libphobos" ; \
 493 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 494 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 495 +       done; \
 496 +       (cd $(TARGET_SUBDIR)/libphobos && \
 497 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 498 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 499 +                 "RANLIB=$${RANLIB}" \
 500 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 501 +                 maintainer-clean) \
 502 +         || exit 1
 503 +
 504 +
 505
 506
 507   # Here are the targets which correspond to the do-X targets.
 508 ***************
 509 *** 17364,17370 ****
 510       maybe-check-target-zlib \
 511       maybe-check-target-boehm-gc \
 512       maybe-check-target-qthreads \
 513 !     maybe-check-target-rda
 514
 515   # Automated reporting of test results.
 516
 517 --- 17570,17577 ----
 518       maybe-check-target-zlib \
 519       maybe-check-target-boehm-gc \
 520       maybe-check-target-qthreads \
 521 !     maybe-check-target-rda \
 522 !     maybe-check-target-libphobos
 523
 524   # Automated reporting of test results.
 525
 526 ***************
 527 *** 17543,17549 ****
 528       maybe-install-target-zlib \
 529       maybe-install-target-boehm-gc \
 530       maybe-install-target-qthreads \
 531 !     maybe-install-target-rda
 532
 533   uninstall:
 534         @echo "the uninstall target is not supported in this tree"
 535 --- 17750,17757 ----
 536       maybe-install-target-zlib \
 537       maybe-install-target-boehm-gc \
 538       maybe-install-target-qthreads \
 539 !     maybe-install-target-rda \
 540 !     maybe-install-target-libphobos
 541
 542   uninstall:
 543         @echo "the uninstall target is not supported in this tree"
 544 ***************
 545 *** 23309,23314 ****
 546 --- 23517,23604 ----
 547           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 548
 549
 550 + .PHONY: configure-target-libphobos maybe-configure-target-libphobos
 551 + maybe-configure-target-libphobos:
 552 +
 553 + # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
 554 + $(TARGET_SUBDIR)/libphobos/multilib.out: multilib.out
 555 +       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos ; \
 556 +       rm -f $(TARGET_SUBDIR)/libphobos/Makefile || : ; \
 557 +       cp multilib.out $(TARGET_SUBDIR)/libphobos/multilib.out
 558 +
 559 + configure-target-libphobos: $(TARGET_SUBDIR)/libphobos/multilib.out
 560 +       @test ! -f $(TARGET_SUBDIR)/libphobos/Makefile || exit 0; \
 561 +       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos ; \
 562 +       r=`${PWD_COMMAND}`; export r; \
 563 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 564 +       $(SET_LIB_PATH) \
 565 +       AR="$(AR_FOR_TARGET)"; export AR; \
 566 +       AS="$(AS_FOR_TARGET)"; export AS; \
 567 +       CC="$(CC_FOR_TARGET)"; export CC; \
 568 +       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 569 +       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
 570 +       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
 571 +       CXX="$(CXX_FOR_TARGET)"; export CXX; \
 572 +       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
 573 +       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
 574 +       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 575 +       LD="$(LD_FOR_TARGET)"; export LD; \
 576 +       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
 577 +       NM="$(NM_FOR_TARGET)"; export NM; \
 578 +       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
 579 +       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 580 +       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
 581 +       @SET_GCC_LIB_PATH@ \
 582 +       echo Configuring in $(TARGET_SUBDIR)/libphobos; \
 583 +       cd "$(TARGET_SUBDIR)/libphobos" || exit 1; \
 584 +       case $(srcdir) in \
 585 +         /* | [A-Za-z]:[\\/]*) \
 586 +           topdir=$(srcdir) ;; \
 587 +         *) \
 588 +           case "$(TARGET_SUBDIR)" in \
 589 +             .) topdir="../$(srcdir)" ;; \
 590 +             *) topdir="../../$(srcdir)" ;; \
 591 +           esac ;; \
 592 +       esac; \
 593 +         srcdiroption="--srcdir=$${topdir}/libphobos"; \
 594 +         libsrcdir="$$s/libphobos"; \
 595 +       rm -f no-such-file || : ; \
 596 +       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 597 +         $(TARGET_CONFIGARGS) $${srcdiroption} \
 598 +         --with-target-subdir="$(TARGET_SUBDIR)" \
 599 +         || exit 1
 600 +
 601 + .PHONY: all-target-libphobos maybe-all-target-libphobos
 602 + maybe-all-target-libphobos:
 603 + all-target-libphobos: configure-target-libphobos
 604 +       @r=`${PWD_COMMAND}`; export r; \
 605 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 606 +       $(SET_LIB_PATH) \
 607 +       (cd $(TARGET_SUBDIR)/libphobos && \
 608 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 609 +
 610 + .PHONY: check-target-libphobos maybe-check-target-libphobos
 611 + maybe-check-target-libphobos:
 612 +
 613 + check-target-libphobos:
 614 +       @r=`${PWD_COMMAND}`; export r; \
 615 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 616 +       $(SET_LIB_PATH) \
 617 +       (cd $(TARGET_SUBDIR)/libphobos && \
 618 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 619 +
 620 +
 621 + .PHONY: install-target-libphobos maybe-install-target-libphobos
 622 + maybe-install-target-libphobos:
 623 +
 624 + install-target-libphobos: installdirs
 625 +       @r=`${PWD_COMMAND}`; export r; \
 626 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 627 +       $(SET_LIB_PATH) \
 628 +       (cd $(TARGET_SUBDIR)/libphobos && \
 629 +         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 630 +
 631 +
 632
 633   # ----------
 634   # GCC module
 635 diff -c gcc-3.4.5-orig/configure gcc-3.4.5/configure
 636 *** gcc-3.4.5-orig/configure    Tue Mar  8 12:31:40 2005
 637 --- gcc-3.4.5/configure Fri Nov 10 15:45:59 2006
 638 ***************
 639 *** 897,902 ****
 640 --- 897,903 ----
 641                 target-newlib \
 642                 target-libstdc++-v3 \
 643                 target-libf2c \
 644 +               target-libphobos \
 645                 ${libgcj} \
 646                 target-libobjc"
 647
 648 ***************
 649 *** 2130,2135 ****
 650 --- 2131,2137 ----
 651     CXXFLAGS=${CXXFLAGS-"-g -O2"}
 652     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
 653     CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
 654 +   CXX_FOR_BUILD=${CXX_FOR_BUILD-c++}
 655     CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
 656     GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
 657     GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
 658 ***************
 659 *** 2188,2193 ****
 660 --- 2190,2196 ----
 661
 662     BISON="\$(USUAL_BISON)"
 663     CC_FOR_BUILD="\$(CC)"
 664 +   CXX_FOR_BUILD="\$(CXX)"
 665     GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
 666     BUILD_PREFIX=
 667     BUILD_PREFIX_1=loser-
 668 ***************
 669 *** 4293,4298 ****
 670 --- 4296,4302 ----
 671   s%@target_configdirs@%$target_configdirs%g
 672   s%@BISON@%$BISON%g
 673   s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
 674 + s%@CXX_FOR_BUILD@%$CXX_FOR_BUILD%g
 675   s%@LEX@%$LEX%g
 676   s%@MAKEINFO@%$MAKEINFO%g
 677   s%@YACC@%$YACC%g
 678 diff -c gcc-3.4.5-orig/configure.in gcc-3.4.5/configure.in
 679 *** gcc-3.4.5-orig/configure.in Tue Mar  8 12:31:40 2005
 680 --- gcc-3.4.5/configure.in      Fri Nov 10 15:45:35 2006
 681 ***************
 682 *** 157,162 ****
 683 --- 157,163 ----
 684                 target-newlib \
 685                 target-libstdc++-v3 \
 686                 target-libf2c \
 687 +               target-libphobos \
 688                 ${libgcj} \
 689                 target-libobjc"
 690
 691 ***************
 692 *** 1369,1374 ****
 693 --- 1370,1376 ----
 694     CXXFLAGS=${CXXFLAGS-"-g -O2"}
 695     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
 696     CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
 697 +   CXX_FOR_BUILD=${CXX_FOR_BUILD-c++}
 698     CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
 699     GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
 700     GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
 701 ***************
 702 *** 1427,1432 ****
 703 --- 1429,1435 ----
 704
 705     BISON="\$(USUAL_BISON)"
 706     CC_FOR_BUILD="\$(CC)"
 707 +   CXX_FOR_BUILD="\$(CXX)"
 708     GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
 709     BUILD_PREFIX=
 710     BUILD_PREFIX_1=loser-
 711 ***************
 712 *** 2085,2090 ****
 713 --- 2088,2094 ----
 714   # Build tools.
 715   AC_SUBST(BISON)
 716   AC_SUBST(CC_FOR_BUILD)
 717 + AC_SUBST(CXX_FOR_BUILD)
 718   AC_SUBST(LEX)
 719   AC_SUBST(MAKEINFO)
 720   AC_SUBST(YACC)