fix recent regression with circular make dependency

H.J. Lu hjl.tools@gmail.com
Sat May 29 16:22:00 GMT 2010


On Sat, May 29, 2010 at 8:08 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Sat, May 29, 2010 at 1:47 AM, Mike Stump <mikestump@comcast.net> wrote:
>> Checked this one in as obvious.
>>
>>        * Makefile.in (build/gencondmd.o): Be sure to use GTM_H instead of
>>        TM_H when building to avoid dependency loops.
>>
>>
>
> This breaks the bootstrap:
>
> In file included from ../../src-trunk/gcc/gcov-dump.c:23:
> ./tm.h:35:29: error: insn-constants.h: No such file or directory
> ./tm.h:36:25: error: insn-flags.h: No such file or directory
> make[6]: *** [gcov-dump.o] Error 1
> make[6]: *** Waiting for unfinished jobs....
> make[6]: *** [gcov.o] Error 1
> echo timestamp > s-gtype
>
> I checked in this patch as an obvious fix.
>
> --
> H.J.
> ----
> Index: ChangeLog
> ===================================================================
> --- ChangeLog   (revision 160028)
> +++ ChangeLog   (working copy)
> @@ -1,3 +1,8 @@
> +2010-05-29  H.J. Lu  <hongjiu.lu@intel.com>
> +
> +       PR bootstrap/44315
> +       * Makefile.in (build/gencondmd.o): Add a missing `\'.
> +
>  2010-05-29  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
>
>        PR target/44261
> @@ -31,6 +36,7 @@
>
>  2010-05-29  Mike Stump  <mikestump@comcast.net>
>
> +       PR bootstrap/44315
>        * Makefile.in (build/gencondmd.o): Be sure to use GTM_H instead of
>        TM_H when building to avoid dependency loops.
>
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revision 160028)
> +++ Makefile.in (working copy)
> @@ -3748,7 +3748,7 @@ build/rtl.o: rtl.c $(BCONFIG_H) coretype
>   $(RTL_H) $(GGC_H) errors.h
>  build/vec.o : vec.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(VEC_H)      \
>    $(GGC_H) $(TOPLEV_H)
> -build/gencondmd.o :
> +build/gencondmd.o : \
>    TM_H := $(GTM_H)
>  build/gencondmd.o : build/gencondmd.c $(BCONFIG_H) $(SYSTEM_H)         \
>   coretypes.h $(GTM_H) insn-constants.h $(RTL_H) $(TM_P_H)             \
>

BTW, I don't believe this fixes the bug.


-- 
H.J.



More information about the Gcc-patches mailing list