From f9897dfa6b0d68a7b3f3e5142bbe4054bc38e6bb Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 29 May 2010 20:26:12 +0000 Subject: [PATCH] re PR bootstrap/44315 (Circular build/gencondmd.o <- insn-flags.h dependency dropped) 2010-05-29 H.J. Lu PR bootstrap/44315 * Makefile.in (build/gencondmd.o): Remove TM_H := $(GTM_H). Filter out insn-flags.h. From-SVN: r160035 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a437373233..3cb2351f473 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-05-29 H.J. Lu + + PR bootstrap/44315 + * Makefile.in (build/gencondmd.o): Remove TM_H := $(GTM_H). + Filter out insn-flags.h. + 2010-05-29 Jan Hubicka * cgraph.h (struct varpool_node_set_def, diff --git a/gcc/Makefile.in b/gcc/Makefile.in index cb432cb7185..646269e340f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3748,12 +3748,11 @@ build/rtl.o: rtl.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H) \ $(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 : \ - 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) \ - $(FUNCTION_H) $(REGS_H) $(RECOG_H) output.h $(FLAGS_H) \ - $(RESOURCE_H) $(TOPLEV_H) reload.h $(EXCEPT_H) tm-constrs.h + coretypes.h $(GTM_H) insn-constants.h \ + $(filter-out insn-flags.h, $(RTL_H) $(TM_P_H) $(FUNCTION_H) $(REGS_H) \ + $(RECOG_H) output.h $(FLAGS_H) $(RESOURCE_H) $(TOPLEV_H) reload.h \ + $(EXCEPT_H) tm-constrs.h) # This pulls in tm-pred.h which contains inline functions wrapping up # predicates from the back-end so those functions must be discarded. # No big deal since gencondmd.c is a dummy file for non-GCC compilers.