bootstrap fixincludes

[Matt Kraai]

On Sun, Nov 28, 2004 at 05:05:15PM -0500, Nathanael Nerode wrote:
> Daniel Jacobowitz wrote:
> >Why bootstrap fixincludes?  It seems to me that it should be a build
> >module, to use during the build, and a host module, so that we can
> >install it on the host.  Ideally we could build the build copy before
> >GCC and the host copy after...
> 
> Right.  That's what we want.  We might not be able to do that directly at
> present for some irritating reasons related to the predefined machine name
> tests, if I remember correctly.  (But that might have been fixed already.)

The attached patch only makes staged dependencies on modules that are
bootstrapped.

Tested on powerpc-unknown-linux-gnu.  OK to commit?

-- 
Matt

	* Makefile.tpl: Generate normal dependencies if the LHS module
	is not bootstrapped.
	* Makefile.in: Regenerate.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.246
diff -u -c -3 -p -r1.246 Makefile.in
*** Makefile.in	13 Nov 2004 07:32:48 -0000	1.246
--- Makefile.in	30 Nov 2004 02:33:31 -0000
*************** all-stage4-gcc: maybe-all-stage4-libiber
*** 35171,35183 ****
  all-stageprofile-gcc: maybe-all-stageprofile-libiberty
  all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
  all-gcc: maybe-all-fixincludes
- 
- all-stage1-gcc: maybe-all-stage1-fixincludes
- all-stage2-gcc: maybe-all-stage2-fixincludes
- all-stage3-gcc: maybe-all-stage3-fixincludes
- all-stage4-gcc: maybe-all-stage4-fixincludes
- all-stageprofile-gcc: maybe-all-stageprofile-fixincludes
- all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
  install-gcc: maybe-install-fixincludes
  configure-libcpp: configure-libiberty
  
--- 35171,35176 ----
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.117
diff -u -c -3 -p -r1.117 Makefile.tpl
*** Makefile.tpl	13 Nov 2004 07:32:47 -0000	1.117
--- Makefile.tpl	30 Nov 2004 02:33:38 -0000
*************** configure-target-[+module+]: maybe-all-t
*** 1624,1631 ****
     (define dep-maybe (lambda ()
        (if (exist? "hard") "" "maybe-")))
  
!    ;; dep-kind returns "normal" is the dependency is on an "install" target,
!    ;; or if the LHS module is not bootstrapped.  It returns "bootstrap" for
     ;; configure or build dependencies between bootstrapped modules; it returns
     ;; "prebootstrap" for configure or build dependencies of bootstrapped
     ;; modules on a build module (e.g. all-gcc on all-build-bison).  All this
--- 1624,1631 ----
     (define dep-maybe (lambda ()
        (if (exist? "hard") "" "maybe-")))
  
!    ;; dep-kind returns "normal" if the dependency is on an "install" target,
!    ;; or if either module is not bootstrapped.  It returns "bootstrap" for
     ;; configure or build dependencies between bootstrapped modules; it returns
     ;; "prebootstrap" for configure or build dependencies of bootstrapped
     ;; modules on a build module (e.g. all-gcc on all-build-bison).  All this
*************** configure-target-[+module+]: maybe-all-t
*** 1637,1643 ****
  
  	  (if (or (= (dep-subtarget "on") "install-")
  		  (=* (dep-module "on") "target-")
! 		  (not (hash-ref boot-modules (dep-module "module"))))
                "normal"
  	      "bootstrap"))))
  
--- 1637,1644 ----
  
  	  (if (or (= (dep-subtarget "on") "install-")
  		  (=* (dep-module "on") "target-")
! 		  (not (hash-ref boot-modules (dep-module "module")))
! 		  (not (hash-ref boot-modules (dep-module "on"))))
                "normal"
  	      "bootstrap"))))