patches/patch-toplev-4.1.x

   1         diff -c gcc-4.1.1-orig/Makefile.def gcc-4.1.1/Makefile.def
   2 *** gcc-4.1.1-orig/Makefile.def Fri Nov 11 16:47:07 2005
   3 --- gcc-4.1.1/Makefile.def      Tue Jan 23 19:39:14 2007
   4 ***************
   5 *** 136,141 ****
   6 --- 136,142 ----
   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.1.1-orig/Makefile.in gcc-4.1.1/Makefile.in
  15 *** gcc-4.1.1-orig/Makefile.in  Tue Apr  4 17:03:05 2006
  16 --- gcc-4.1.1/Makefile.in       Tue Jan 23 19:39:14 2007
  17 ***************
  18 *** 626,632 ****
  19       maybe-configure-target-boehm-gc \
  20       maybe-configure-target-qthreads \
  21       maybe-configure-target-rda \
  22 !     maybe-configure-target-libada
  23
  24   # The target built for a native non-bootstrap build.
  25   .PHONY: all
  26 --- 626,633 ----
  27       maybe-configure-target-boehm-gc \
  28       maybe-configure-target-qthreads \
  29       maybe-configure-target-rda \
  30 !     maybe-configure-target-libada \
  31 !     maybe-configure-target-libphobos
  32
  33   # The target built for a native non-bootstrap build.
  34   .PHONY: all
  35 ***************
  36 *** 745,751 ****
  37       maybe-all-target-boehm-gc \
  38       maybe-all-target-qthreads \
  39       maybe-all-target-rda \
  40 !     maybe-all-target-libada
  41
  42   # Do a target for all the subdirectories.  A ``make do-X'' will do a
  43   # ``make X'' in all subdirectories (because, in general, there is a
  44 --- 746,753 ----
  45       maybe-all-target-boehm-gc \
  46       maybe-all-target-qthreads \
  47       maybe-all-target-rda \
  48 !     maybe-all-target-libada \
  49 !     maybe-all-target-libphobos
  50
  51   # Do a target for all the subdirectories.  A ``make do-X'' will do a
  52   # ``make X'' in all subdirectories (because, in general, there is a
  53 ***************
  54 *** 852,858 ****
  55       maybe-info-target-boehm-gc \
  56       maybe-info-target-qthreads \
  57       maybe-info-target-rda \
  58 !     maybe-info-target-libada
  59
  60   .PHONY: do-dvi
  61   do-dvi:
  62 --- 854,861 ----
  63       maybe-info-target-boehm-gc \
  64       maybe-info-target-qthreads \
  65       maybe-info-target-rda \
  66 !     maybe-info-target-libada \
  67 !     maybe-info-target-libphobos
  68
  69   .PHONY: do-dvi
  70   do-dvi:
  71 ***************
  72 *** 954,960 ****
  73       maybe-dvi-target-boehm-gc \
  74       maybe-dvi-target-qthreads \
  75       maybe-dvi-target-rda \
  76 !     maybe-dvi-target-libada
  77
  78   .PHONY: do-html
  79   do-html:
  80 --- 957,964 ----
  81       maybe-dvi-target-boehm-gc \
  82       maybe-dvi-target-qthreads \
  83       maybe-dvi-target-rda \
  84 !     maybe-dvi-target-libada \
  85 !     maybe-dvi-target-libphobos
  86
  87   .PHONY: do-html
  88   do-html:
  89 ***************
  90 *** 1056,1062 ****
  91       maybe-html-target-boehm-gc \
  92       maybe-html-target-qthreads \
  93       maybe-html-target-rda \
  94 !     maybe-html-target-libada
  95
  96   .PHONY: do-TAGS
  97   do-TAGS:
  98 --- 1060,1067 ----
  99       maybe-html-target-boehm-gc \
 100       maybe-html-target-qthreads \
 101       maybe-html-target-rda \
 102 !     maybe-html-target-libada \
 103 !     maybe-html-target-libphobos
 104
 105   .PHONY: do-TAGS
 106   do-TAGS:
 107 ***************
 108 *** 1158,1164 ****
 109       maybe-TAGS-target-boehm-gc \
 110       maybe-TAGS-target-qthreads \
 111       maybe-TAGS-target-rda \
 112 !     maybe-TAGS-target-libada
 113
 114   .PHONY: do-install-info
 115   do-install-info:
 116 --- 1163,1170 ----
 117       maybe-TAGS-target-boehm-gc \
 118       maybe-TAGS-target-qthreads \
 119       maybe-TAGS-target-rda \
 120 !     maybe-TAGS-target-libada \
 121 !     maybe-TAGS-target-libphobos
 122
 123   .PHONY: do-install-info
 124   do-install-info:
 125 ***************
 126 *** 1260,1266 ****
 127       maybe-install-info-target-boehm-gc \
 128       maybe-install-info-target-qthreads \
 129       maybe-install-info-target-rda \
 130 !     maybe-install-info-target-libada
 131
 132   .PHONY: do-installcheck
 133   do-installcheck:
 134 --- 1266,1273 ----
 135       maybe-install-info-target-boehm-gc \
 136       maybe-install-info-target-qthreads \
 137       maybe-install-info-target-rda \
 138 !     maybe-install-info-target-libada \
 139 !     maybe-install-info-target-libphobos
 140
 141   .PHONY: do-installcheck
 142   do-installcheck:
 143 ***************
 144 *** 1362,1368 ****
 145       maybe-installcheck-target-boehm-gc \
 146       maybe-installcheck-target-qthreads \
 147       maybe-installcheck-target-rda \
 148 !     maybe-installcheck-target-libada
 149
 150   .PHONY: do-mostlyclean
 151   do-mostlyclean:
 152 --- 1369,1376 ----
 153       maybe-installcheck-target-boehm-gc \
 154       maybe-installcheck-target-qthreads \
 155       maybe-installcheck-target-rda \
 156 !     maybe-installcheck-target-libada \
 157 !     maybe-installcheck-target-libphobos
 158
 159   .PHONY: do-mostlyclean
 160   do-mostlyclean:
 161 ***************
 162 *** 1464,1470 ****
 163       maybe-mostlyclean-target-boehm-gc \
 164       maybe-mostlyclean-target-qthreads \
 165       maybe-mostlyclean-target-rda \
 166 !     maybe-mostlyclean-target-libada
 167
 168   .PHONY: do-clean
 169   do-clean:
 170 --- 1472,1479 ----
 171       maybe-mostlyclean-target-boehm-gc \
 172       maybe-mostlyclean-target-qthreads \
 173       maybe-mostlyclean-target-rda \
 174 !     maybe-mostlyclean-target-libada \
 175 !     maybe-mostlyclean-target-libphobos
 176
 177   .PHONY: do-clean
 178   do-clean:
 179 ***************
 180 *** 1566,1572 ****
 181       maybe-clean-target-boehm-gc \
 182       maybe-clean-target-qthreads \
 183       maybe-clean-target-rda \
 184 !     maybe-clean-target-libada
 185
 186   .PHONY: do-distclean
 187   do-distclean:
 188 --- 1575,1582 ----
 189       maybe-clean-target-boehm-gc \
 190       maybe-clean-target-qthreads \
 191       maybe-clean-target-rda \
 192 !     maybe-clean-target-libada \
 193 !     maybe-clean-target-libphobos
 194
 195   .PHONY: do-distclean
 196   do-distclean:
 197 ***************
 198 *** 1668,1674 ****
 199       maybe-distclean-target-boehm-gc \
 200       maybe-distclean-target-qthreads \
 201       maybe-distclean-target-rda \
 202 !     maybe-distclean-target-libada
 203
 204   .PHONY: do-maintainer-clean
 205   do-maintainer-clean:
 206 --- 1678,1685 ----
 207       maybe-distclean-target-boehm-gc \
 208       maybe-distclean-target-qthreads \
 209       maybe-distclean-target-rda \
 210 !     maybe-distclean-target-libada \
 211 !     maybe-distclean-target-libphobos
 212
 213   .PHONY: do-maintainer-clean
 214   do-maintainer-clean:
 215 ***************
 216 *** 1770,1776 ****
 217       maybe-maintainer-clean-target-boehm-gc \
 218       maybe-maintainer-clean-target-qthreads \
 219       maybe-maintainer-clean-target-rda \
 220 !     maybe-maintainer-clean-target-libada
 221
 222
 223   # Here are the targets which correspond to the do-X targets.
 224 --- 1781,1788 ----
 225       maybe-maintainer-clean-target-boehm-gc \
 226       maybe-maintainer-clean-target-qthreads \
 227       maybe-maintainer-clean-target-rda \
 228 !     maybe-maintainer-clean-target-libada \
 229 !     maybe-maintainer-clean-target-libphobos
 230
 231
 232   # Here are the targets which correspond to the do-X targets.
 233 ***************
 234 *** 1928,1934 ****
 235       maybe-check-target-boehm-gc \
 236       maybe-check-target-qthreads \
 237       maybe-check-target-rda \
 238 !     maybe-check-target-libada
 239
 240   do-check:
 241         @: $(MAKE); $(unstage)
 242 --- 1940,1947 ----
 243       maybe-check-target-boehm-gc \
 244       maybe-check-target-qthreads \
 245       maybe-check-target-rda \
 246 !     maybe-check-target-libada \
 247 !     maybe-check-target-libphobos
 248
 249   do-check:
 250         @: $(MAKE); $(unstage)
 251 ***************
 252 *** 2127,2133 ****
 253       maybe-install-target-boehm-gc \
 254       maybe-install-target-qthreads \
 255       maybe-install-target-rda \
 256 !     maybe-install-target-libada
 257
 258   uninstall:
 259         @echo "the uninstall target is not supported in this tree"
 260 --- 2140,2147 ----
 261       maybe-install-target-boehm-gc \
 262       maybe-install-target-qthreads \
 263       maybe-install-target-rda \
 264 !     maybe-install-target-libada \
 265 !     maybe-install-target-libphobos
 266
 267   uninstall:
 268         @echo "the uninstall target is not supported in this tree"
 269 ***************
 270 *** 34743,34748 ****
 271 --- 34757,35111 ----
 272
 273
 274
 275 + # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
 276 + @if target-libphobos
 277 + $(TARGET_SUBDIR)/libphobos/multilib.out: multilib.out
 278 +       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos ; \
 279 +       rm -f $(TARGET_SUBDIR)/libphobos/Makefile || : ; \
 280 +       cp multilib.out $(TARGET_SUBDIR)/libphobos/multilib.out
 281 + @endif target-libphobos
 282 +
 283 +
 284 +
 285 + .PHONY: configure-target-libphobos maybe-configure-target-libphobos
 286 + maybe-configure-target-libphobos:
 287 + @if target-libphobos
 288 + maybe-configure-target-libphobos: configure-target-libphobos
 289 + configure-target-libphobos: $(TARGET_SUBDIR)/libphobos/multilib.out
 290 +       @$(unstage)
 291 +       @test ! -f $(TARGET_SUBDIR)/libphobos/Makefile || exit 0; \
 292 +       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos ; \
 293 +       r=`${PWD_COMMAND}`; export r; \
 294 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 295 +       $(NORMAL_TARGET_EXPORTS) \
 296 +       echo Configuring in $(TARGET_SUBDIR)/libphobos; \
 297 +       cd "$(TARGET_SUBDIR)/libphobos" || exit 1; \
 298 +       case $(srcdir) in \
 299 +         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 300 +         *) topdir=`echo $(TARGET_SUBDIR)/libphobos/ | \
 301 +               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
 302 +       esac; \
 303 +       srcdiroption="--srcdir=$${topdir}/libphobos"; \
 304 +       libsrcdir="$$s/libphobos"; \
 305 +       rm -f no-such-file || : ; \
 306 +       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 307 +         $(TARGET_CONFIGARGS) $${srcdiroption}  \
 308 +         || exit 1
 309 + @endif target-libphobos
 310 +
 311 +
 312 +
 313 +
 314 +
 315 + .PHONY: all-target-libphobos maybe-all-target-libphobos
 316 + maybe-all-target-libphobos:
 317 + @if target-libphobos
 318 + TARGET-target-libphobos=all
 319 + maybe-all-target-libphobos: all-target-libphobos
 320 + all-target-libphobos: configure-target-libphobos
 321 +       @$(unstage)
 322 +       @r=`${PWD_COMMAND}`; export r; \
 323 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 324 +       $(NORMAL_TARGET_EXPORTS) \
 325 +       (cd $(TARGET_SUBDIR)/libphobos && \
 326 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libphobos))
 327 + @endif target-libphobos
 328 +
 329 +
 330 +
 331 +
 332 +
 333 + .PHONY: check-target-libphobos maybe-check-target-libphobos
 334 + maybe-check-target-libphobos:
 335 + @if target-libphobos
 336 + maybe-check-target-libphobos: check-target-libphobos
 337 +
 338 + check-target-libphobos:
 339 +       @: $(MAKE); $(unstage)
 340 +       @r=`${PWD_COMMAND}`; export r; \
 341 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 342 +       $(NORMAL_TARGET_EXPORTS) \
 343 +       (cd $(TARGET_SUBDIR)/libphobos && \
 344 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 345 +
 346 + @endif target-libphobos
 347 +
 348 + .PHONY: install-target-libphobos maybe-install-target-libphobos
 349 + maybe-install-target-libphobos:
 350 + @if target-libphobos
 351 + maybe-install-target-libphobos: install-target-libphobos
 352 +
 353 + install-target-libphobos: installdirs
 354 +       @: $(MAKE); $(unstage)
 355 +       @r=`${PWD_COMMAND}`; export r; \
 356 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 357 +       $(NORMAL_TARGET_EXPORTS) \
 358 +       (cd $(TARGET_SUBDIR)/libphobos && \
 359 +         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 360 +
 361 + @endif target-libphobos
 362 +
 363 + # Other targets (info, dvi, etc.)
 364 +
 365 + .PHONY: maybe-info-target-libphobos info-target-libphobos
 366 + maybe-info-target-libphobos:
 367 + @if target-libphobos
 368 + maybe-info-target-libphobos: info-target-libphobos
 369 +
 370 + info-target-libphobos: \
 371 +     configure-target-libphobos
 372 +       @: $(MAKE); $(unstage)
 373 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 374 +       r=`${PWD_COMMAND}`; export r; \
 375 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 376 +       $(NORMAL_TARGET_EXPORTS) \
 377 +       echo "Doing info in $(TARGET_SUBDIR)/libphobos" ; \
 378 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 379 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 380 +       done; \
 381 +       (cd $(TARGET_SUBDIR)/libphobos && \
 382 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 383 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 384 +                 "RANLIB=$${RANLIB}" \
 385 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 386 +                  info) \
 387 +         || exit 1
 388 +
 389 + @endif target-libphobos
 390 +
 391 + .PHONY: maybe-dvi-target-libphobos dvi-target-libphobos
 392 + maybe-dvi-target-libphobos:
 393 + @if target-libphobos
 394 + maybe-dvi-target-libphobos: dvi-target-libphobos
 395 +
 396 + dvi-target-libphobos: \
 397 +     configure-target-libphobos
 398 +       @: $(MAKE); $(unstage)
 399 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 400 +       r=`${PWD_COMMAND}`; export r; \
 401 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 402 +       $(NORMAL_TARGET_EXPORTS) \
 403 +       echo "Doing dvi in $(TARGET_SUBDIR)/libphobos" ; \
 404 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 405 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 406 +       done; \
 407 +       (cd $(TARGET_SUBDIR)/libphobos && \
 408 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 409 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 410 +                 "RANLIB=$${RANLIB}" \
 411 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 412 +                  dvi) \
 413 +         || exit 1
 414 +
 415 + @endif target-libphobos
 416 +
 417 + .PHONY: maybe-html-target-libphobos html-target-libphobos
 418 + maybe-html-target-libphobos:
 419 + @if target-libphobos
 420 + maybe-html-target-libphobos: html-target-libphobos
 421 +
 422 + html-target-libphobos: \
 423 +     configure-target-libphobos
 424 +       @: $(MAKE); $(unstage)
 425 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 426 +       r=`${PWD_COMMAND}`; export r; \
 427 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 428 +       $(NORMAL_TARGET_EXPORTS) \
 429 +       echo "Doing html in $(TARGET_SUBDIR)/libphobos" ; \
 430 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 431 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 432 +       done; \
 433 +       (cd $(TARGET_SUBDIR)/libphobos && \
 434 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 435 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 436 +                 "RANLIB=$${RANLIB}" \
 437 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 438 +                  html) \
 439 +         || exit 1
 440 +
 441 + @endif target-libphobos
 442 +
 443 + .PHONY: maybe-TAGS-target-libphobos TAGS-target-libphobos
 444 + maybe-TAGS-target-libphobos:
 445 + @if target-libphobos
 446 + maybe-TAGS-target-libphobos: TAGS-target-libphobos
 447 +
 448 + TAGS-target-libphobos: \
 449 +     configure-target-libphobos
 450 +       @: $(MAKE); $(unstage)
 451 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 452 +       r=`${PWD_COMMAND}`; export r; \
 453 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 454 +       $(NORMAL_TARGET_EXPORTS) \
 455 +       echo "Doing TAGS in $(TARGET_SUBDIR)/libphobos" ; \
 456 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 457 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 458 +       done; \
 459 +       (cd $(TARGET_SUBDIR)/libphobos && \
 460 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 461 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 462 +                 "RANLIB=$${RANLIB}" \
 463 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 464 +                  TAGS) \
 465 +         || exit 1
 466 +
 467 + @endif target-libphobos
 468 +
 469 + .PHONY: maybe-install-info-target-libphobos install-info-target-libphobos
 470 + maybe-install-info-target-libphobos:
 471 + @if target-libphobos
 472 + maybe-install-info-target-libphobos: install-info-target-libphobos
 473 +
 474 + install-info-target-libphobos: \
 475 +     configure-target-libphobos \
 476 +     info-target-libphobos
 477 +       @: $(MAKE); $(unstage)
 478 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 479 +       r=`${PWD_COMMAND}`; export r; \
 480 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 481 +       $(NORMAL_TARGET_EXPORTS) \
 482 +       echo "Doing install-info in $(TARGET_SUBDIR)/libphobos" ; \
 483 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 484 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 485 +       done; \
 486 +       (cd $(TARGET_SUBDIR)/libphobos && \
 487 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 488 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 489 +                 "RANLIB=$${RANLIB}" \
 490 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 491 +                  install-info) \
 492 +         || exit 1
 493 +
 494 + @endif target-libphobos
 495 +
 496 + .PHONY: maybe-installcheck-target-libphobos installcheck-target-libphobos
 497 + maybe-installcheck-target-libphobos:
 498 + @if target-libphobos
 499 + maybe-installcheck-target-libphobos: installcheck-target-libphobos
 500 +
 501 + installcheck-target-libphobos: \
 502 +     configure-target-libphobos
 503 +       @: $(MAKE); $(unstage)
 504 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 505 +       r=`${PWD_COMMAND}`; export r; \
 506 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 507 +       $(NORMAL_TARGET_EXPORTS) \
 508 +       echo "Doing installcheck in $(TARGET_SUBDIR)/libphobos" ; \
 509 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 510 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 511 +       done; \
 512 +       (cd $(TARGET_SUBDIR)/libphobos && \
 513 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 514 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 515 +                 "RANLIB=$${RANLIB}" \
 516 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 517 +                  installcheck) \
 518 +         || exit 1
 519 +
 520 + @endif target-libphobos
 521 +
 522 + .PHONY: maybe-mostlyclean-target-libphobos mostlyclean-target-libphobos
 523 + maybe-mostlyclean-target-libphobos:
 524 + @if target-libphobos
 525 + maybe-mostlyclean-target-libphobos: mostlyclean-target-libphobos
 526 +
 527 + mostlyclean-target-libphobos:
 528 +       @: $(MAKE); $(unstage)
 529 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 530 +       r=`${PWD_COMMAND}`; export r; \
 531 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 532 +       $(NORMAL_TARGET_EXPORTS) \
 533 +       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libphobos" ; \
 534 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 535 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 536 +       done; \
 537 +       (cd $(TARGET_SUBDIR)/libphobos && \
 538 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 539 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 540 +                 "RANLIB=$${RANLIB}" \
 541 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 542 +                  mostlyclean) \
 543 +         || exit 1
 544 +
 545 + @endif target-libphobos
 546 +
 547 + .PHONY: maybe-clean-target-libphobos clean-target-libphobos
 548 + maybe-clean-target-libphobos:
 549 + @if target-libphobos
 550 + maybe-clean-target-libphobos: clean-target-libphobos
 551 +
 552 + clean-target-libphobos:
 553 +       @: $(MAKE); $(unstage)
 554 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 555 +       r=`${PWD_COMMAND}`; export r; \
 556 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 557 +       $(NORMAL_TARGET_EXPORTS) \
 558 +       echo "Doing clean in $(TARGET_SUBDIR)/libphobos" ; \
 559 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 560 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 561 +       done; \
 562 +       (cd $(TARGET_SUBDIR)/libphobos && \
 563 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 564 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 565 +                 "RANLIB=$${RANLIB}" \
 566 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 567 +                  clean) \
 568 +         || exit 1
 569 +
 570 + @endif target-libphobos
 571 +
 572 + .PHONY: maybe-distclean-target-libphobos distclean-target-libphobos
 573 + maybe-distclean-target-libphobos:
 574 + @if target-libphobos
 575 + maybe-distclean-target-libphobos: distclean-target-libphobos
 576 +
 577 + distclean-target-libphobos:
 578 +       @: $(MAKE); $(unstage)
 579 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 580 +       r=`${PWD_COMMAND}`; export r; \
 581 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 582 +       $(NORMAL_TARGET_EXPORTS) \
 583 +       echo "Doing distclean in $(TARGET_SUBDIR)/libphobos" ; \
 584 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 585 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 586 +       done; \
 587 +       (cd $(TARGET_SUBDIR)/libphobos && \
 588 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 589 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 590 +                 "RANLIB=$${RANLIB}" \
 591 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 592 +                  distclean) \
 593 +         || exit 1
 594 +
 595 + @endif target-libphobos
 596 +
 597 + .PHONY: maybe-maintainer-clean-target-libphobos maintainer-clean-target-libphobos
 598 + maybe-maintainer-clean-target-libphobos:
 599 + @if target-libphobos
 600 + maybe-maintainer-clean-target-libphobos: maintainer-clean-target-libphobos
 601 +
 602 + maintainer-clean-target-libphobos:
 603 +       @: $(MAKE); $(unstage)
 604 +       @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0 ; \
 605 +       r=`${PWD_COMMAND}`; export r; \
 606 +       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 607 +       $(NORMAL_TARGET_EXPORTS) \
 608 +       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libphobos" ; \
 609 +       for flag in $(EXTRA_TARGET_FLAGS); do \
 610 +         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 611 +       done; \
 612 +       (cd $(TARGET_SUBDIR)/libphobos && \
 613 +         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 614 +                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 615 +                 "RANLIB=$${RANLIB}" \
 616 +                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 617 +                  maintainer-clean) \
 618 +         || exit 1
 619 +
 620 + @endif target-libphobos
 621 +
 622 +
 623 +
 624   # ----------
 625   # GCC module
 626   # ----------
 627 ***************
 628 *** 36182,36187 ****
 629 --- 36545,36552 ----
 630
 631   configure-target-libada: maybe-all-gcc
 632
 633 + configure-target-libphobos: maybe-all-gcc
 634 +
 635
 636
 637   configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
 638 Common subdirectories: gcc-4.1.1-orig/config and gcc-4.1.1/config
 639 diff -c gcc-4.1.1-orig/configure gcc-4.1.1/configure
 640 *** gcc-4.1.1-orig/configure    Fri Dec 16 07:57:40 2005
 641 --- gcc-4.1.1/configure Tue Jan 23 19:39:14 2007
 642 ***************
 643 *** 909,914 ****
 644 --- 909,915 ----
 645                 target-libgfortran \
 646                 ${libgcj} \
 647                 target-libobjc \
 648 +               target-libphobos \
 649                 target-libada"
 650
 651   # these tools are built using the target libraries, and are intended to
 652 ***************
 653 *** 1802,1807 ****
 654 --- 1803,1809 ----
 655     CXX=${CXX-${host_alias}-c++}
 656     CXXFLAGS=${CXXFLAGS-"-g -O2"}
 657     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
 658 +   CXX_FOR_BUILD=${CXX_FOR_BUILD-c++}
 659     BUILD_PREFIX=${build_alias}-
 660     BUILD_PREFIX_1=${build_alias}-
 661
 662 ***************
 663 *** 1815,1820 ****
 664 --- 1817,1823 ----
 665     # This is all going to change when we autoconfiscate...
 666
 667     CC_FOR_BUILD="\$(CC)"
 668 +   CXX_FOR_BUILD="\$(CXX)"
 669     BUILD_PREFIX=
 670     BUILD_PREFIX_1=loser-
 671
 672 ***************
 673 *** 6311,6316 ****
 674 --- 6314,6320 ----
 675   s%@target_configargs@%$target_configargs%g
 676   s%@target_configdirs@%$target_configdirs%g
 677   s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
 678 + s%@CXX_FOR_BUILD@%$CXX_FOR_BUILD%g
 679   s%@config_shell@%$config_shell%g
 680   s%@YACC@%$YACC%g
 681   s%@BISON@%$BISON%g
 682 diff -c gcc-4.1.1-orig/configure.in gcc-4.1.1/configure.in
 683 *** gcc-4.1.1-orig/configure.in Fri Dec 16 07:57:40 2005
 684 --- gcc-4.1.1/configure.in      Tue Jan 23 19:39:14 2007
 685 ***************
 686 *** 151,156 ****
 687 --- 151,157 ----
 688                 target-libgfortran \
 689                 ${libgcj} \
 690                 target-libobjc \
 691 +               target-libphobos \
 692                 target-libada"
 693
 694   # these tools are built using the target libraries, and are intended to
 695 ***************
 696 *** 1010,1015 ****
 697 --- 1011,1017 ----
 698     CXX=${CXX-${host_alias}-c++}
 699     CXXFLAGS=${CXXFLAGS-"-g -O2"}
 700     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
 701 +   CXX_FOR_BUILD=${CXX_FOR_BUILD-c++}
 702     BUILD_PREFIX=${build_alias}-
 703     BUILD_PREFIX_1=${build_alias}-
 704
 705 ***************
 706 *** 1023,1028 ****
 707 --- 1025,1031 ----
 708     # This is all going to change when we autoconfiscate...
 709
 710     CC_FOR_BUILD="\$(CC)"
 711 +   CXX_FOR_BUILD="\$(CXX)"
 712     BUILD_PREFIX=
 713     BUILD_PREFIX_1=loser-
 714
 715 ***************
 716 *** 2086,2091 ****
 717 --- 2089,2095 ----
 718
 719   # Build tools.
 720   AC_SUBST(CC_FOR_BUILD)
 721 + AC_SUBST(CXX_FOR_BUILD)
 722   AC_SUBST(config_shell)
 723
 724   # Generate default definitions for YACC, M4, LEX and other programs that run