Re: PATCH: Break fixproto-enquire dependency (was: Re: Irix make loop (stmp-multilib) )

[Manfred dot Hollstein at ks dot sel dot alcatel dot de]

On Thu, 7 May 1998, 16:39:44, manfred@s-direktnet.de wrote:

 > To fix my current problem on m68k-motorola-sysv, I've appended a
 > modified patch, which simply uses "stmp-int-hdrs" instead of
 > "stmp-headers" and adds the latter where necessary.
 > 
 > If we'd decide to take one consistent approach for both gfloat.h-nat
 > and gfloat.h-cross, I'll come up with a patch for it.
 > 
 > Is it OK to check in the patch below?
 > 

%^&*&^% It's still not correct :-( Need to swap order of $(LIBGCC) and 
$(STMP_FIXPROTO) (this - final (?) - patch replaces all earlier ones):

Mon May 11 10:29:10 1998  Manfred Hollstein  <manfred@s-direktnet.de>

	* Makefile.in (all.cross): Surround $(LIBGCC) and $(STMP_FIXPROTO)
	with stmp-int-hdrs and stmp-headers dependencies to break dependency
	upon gfloat.h and enquire; swap order of $(LIBGCC) and $(STMP_FIXPROTO).
	(rest.encap): Likewise.
	(install-headers-tar): Likewise.
	(install-headers-cpio): Likewise.
	(stmp-fixproto): Add comment; change to depend upon stmp-int-hdrs
	instead of stmp-headers.

diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19980508.orig/gcc/Makefile.in egcs-19980508/gcc/Makefile.in
--- egcs-19980508.orig/gcc/Makefile.in	Fri May  8 09:36:09 1998
+++ egcs-19980508/gcc/Makefile.in	Fri May  8 09:36:09 1998
@@ -757,14 +757,15 @@ all.internal: start.encap rest.encap
 # This is what to compile if making a cross-compiler.
 # Note that we can compile enquire using the cross-compiler just built,
 # although we can't run it on this machine.
-all.cross: native gcc-cross specs stmp-headers $(LIBGCC) $(STMP_FIXPROTO) \
-	$(LIBGCC1_TEST) $(EXTRA_PARTS) lang.all.cross
+all.cross: native gcc-cross specs stmp-int-hdrs $(STMP_FIXPROTO) $(LIBGCC) \
+	stmp-headers $(LIBGCC1_TEST) $(EXTRA_PARTS) lang.all.cross
 # This is what to compile if making gcc with a cross-compiler.
 all.build: native xgcc$(exeext) $(EXTRA_PARTS) lang.all.build
 # This is what must be made before installing GCC and converting libraries.
 start.encap: native xgcc$(exeext) specs $(LIBGCC1) xlimits.h lang.start.encap
 # These can't be made until after GCC can run.
-rest.encap: stmp-headers $(LIBGCC) $(STMP_FIXPROTO) $(EXTRA_PARTS) lang.rest.encap
+rest.encap: stmp-int-hdrs $(STMP_FIXPROTO) $(LIBGCC) stmp-headers \
+	$(EXTRA_PARTS) lang.rest.encap
 # This is what is made with the host's compiler
 # whether making a cross compiler or not.
 native: config.status auto-host.h cpp$(exeext) $(LANGUAGES) \
@@ -2014,9 +2015,11 @@ fixhdr.ready: fix-header
 	fi
 
 # stmp-headers is to make sure fixincludes has already finished.
+# Note, we only use stmp-int-hdrs now to ensure all include files but float.h
+# have been created which are necessary for building libgcc2.a.
 # The if statement is so that we don't run fixproto a second time
 # if it has already been run on the files in `include'.
-stmp-fixproto: fixhdr.ready fixproto stmp-headers
+stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
 	@echo "Various warnings and error messages from fixproto are normal"
 	-if [ -d include ] ; then true; else mkdir include; fi
 	-if [ -f include/fixed ] ; then true; \
@@ -2379,7 +2382,7 @@ install-include-dir: installdirs
 	-chmod a+rx $(libsubdir)/include
 
 # Install the include directory using tar.
-install-headers-tar: stmp-headers $(STMP_FIXPROTO) install-include-dir
+install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) stmp-headers install-include-dir
 	(cd include; \
 	 tar -cf - .; exit 0) | (cd $(libsubdir)/include; tar $(TAROUTOPTS) - )
 # /bin/sh on some systems returns the status of the first tar,
@@ -2387,7 +2390,7 @@ install-headers-tar: stmp-headers $(STMP
 # So use `exit 0' to ignore its exit status.
 
 # Install the include directory using cpio.
-install-headers-cpio: stmp-headers $(STMP_FIXPROTO) install-include-dir
+install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) stmp-headers install-include-dir
 	(cd include; find . -print) | (cd include; cpio -pdum $(libsubdir)/include)
 
 # Put assert.h where it won't override GNU libc's assert.h.