Commit missing Makefile update for r137158.

[pf3gnuchains/gcc-fork.git] / gcc / Makefile.in

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 47a45a1..c8f3b18 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -772,7 +772,8 @@ RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H) reg-notes.def insn-notes.def \
 RTL_H = $(RTL_BASE_H) genrtl.h
 PARAMS_H = params.h params.def
 BUILTINS_DEF = builtins.def sync-builtins.def omp-builtins.def
-TREE_H = tree.h tree.def $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \
+TREE_H = tree.h all-tree.def tree.def c-common.def $(lang_tree_files) \
+          $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \
           input.h statistics.h vec.h treestruct.def $(HASHTAB_H) \
           double-int.h alias.h
 BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h $(PARTITION_H) \
@@ -958,6 +959,7 @@ FLAGS_TO_PASS = \
        "gcc_tooldir=$(gcc_tooldir)" \
        "bindir=$(bindir)" \
        "libexecsubdir=$(libsubdir)" \
+       "datarootdir=$(datarootdir)" \
        "datadir=$(datadir)" \
        "localedir=$(localedir)"
 #\f
@@ -1375,6 +1377,19 @@ ifneq ($(xmake_file),)
 include $(xmake_file)
 endif
 
+# all-tree.def includes all the tree.def files.
+all-tree.def: s-alltree; @true
+s-alltree: Makefile
+       rm -f tmp-all-tree.def
+       echo '#include "tree.def"' > tmp-all-tree.def
+       echo 'END_OF_BASE_TREE_CODES' >> tmp-all-tree.def
+       echo '#include "c-common.def"' >> tmp-all-tree.def
+       ltf="$(lang_tree_files)"; for f in $$ltf; do \
+         echo "#include \"$$f\""; \
+       done | sed 's|$(srcdir)/||' >> tmp-all-tree.def
+       $(SHELL) $(srcdir)/../move-if-change tmp-all-tree.def all-tree.def
+       $(STAMP) s-alltree
+
 #\f
 
 # -----------------------------
@@ -1894,14 +1909,6 @@ gccspec.o: gccspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
 
 cppspec.o: cppspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
 
-gencheck.h : s-gencheck ; @true
-s-gencheck : Makefile
-       ltf="$(lang_tree_files)"; for f in $$ltf; do \
-           echo "#include \"$$f\""; \
-       done | sed 's|$(srcdir)/||' > tmp-gencheck.h
-       $(SHELL) $(srcdir)/../move-if-change tmp-gencheck.h gencheck.h
-       $(STAMP) s-gencheck
-
 specs.h : s-specs ; @true
 s-specs : Makefile
        lsf="$(lang_specs_files)"; for f in $$lsf; do \
@@ -1983,7 +1990,7 @@ langhooks.o : langhooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    langhooks.h $(LANGHOOKS_DEF_H) $(FLAGS_H) $(GGC_H) $(DIAGNOSTIC_H) intl.h \
    $(TREE_GIMPLE_H)
 tree.o : tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   $(FLAGS_H) $(FUNCTION_H) $(PARAMS_H) \
+   all-tree.def $(FLAGS_H) $(FUNCTION_H) $(PARAMS_H) \
    toplev.h $(GGC_H) $(HASHTAB_H) $(TARGET_H) output.h $(TM_P_H) langhooks.h \
    $(REAL_H) gt-tree.h tree-iterator.h $(BASIC_BLOCK_H) $(TREE_FLOW_H) \
    $(OBSTACK_H) pointer-set.h fixed-value.h
@@ -2688,7 +2695,7 @@ cfgrtl.o : cfgrtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    tree-pass.h $(DF_H)
 cfganal.o : cfganal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(BASIC_BLOCK_H) hard-reg-set.h insn-config.h $(RECOG_H) $(TM_P_H) \
-   $(TIMEVAR_H) $(OBSTACK_H) toplev.h
+   $(TIMEVAR_H) $(OBSTACK_H) toplev.h vecprim.h
 cfgbuild.o : cfgbuild.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(FLAGS_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
    $(FUNCTION_H) except.h $(TIMEVAR_H) $(TREE_H)
@@ -3164,8 +3171,17 @@ GTFILES = $(CPP_ID_DATA_H) $(srcdir)/input.h $(srcdir)/coretypes.h \
   $(srcdir)/targhooks.c $(out_file) $(srcdir)/passes.c $(srcdir)/cgraphunit.c \
   @all_gtfiles@
 
-GTFILES_H = $(subst /,-, $(patsubst $(srcdir)/%,gt-%, $(patsubst %.c,%.h, \
-                 $(filter %.c, $(GTFILES)))))
+# Compute the list of GT header files from the corresponding C sources,
+# possibly nested within config or language subdirectories.  Match gengtype's
+# behavior in this respect: gt-LANG-file.h for "file" anywhere within a LANG
+# language subdir, gt-file.h otherwise (no subdir indication for config/
+# related sources).
+
+GTFILES_H = $(subst /,-, \
+           $(shell echo $(patsubst $(srcdir)/%,gt-%, \
+                          $(patsubst %.c,%.h, \
+                            $(filter %.c, $(GTFILES)))) \
+                       | sed -e "s|/[^ ]*/|/|g" -e "s|gt-config/|gt-|g"))
 
 GTFILES_LANG_H = $(patsubst [%], gtype-%.h, $(filter [%], $(GTFILES)))
 ALL_GTFILES_H := $(sort $(GTFILES_H) $(GTFILES_LANG_H))
@@ -3238,7 +3254,7 @@ build/genattrtab.o : genattrtab.c $(RTL_BASE_H) $(OBSTACK_H)              \
 build/genautomata.o : genautomata.c $(RTL_BASE_H) $(OBSTACK_H)         \
   $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h vec.h         \
   $(HASHTAB_H) gensupport.h
-build/gencheck.o : gencheck.c gencheck.h tree.def $(BCONFIG_H) $(GTM_H)        \
+build/gencheck.o : gencheck.c tree.def $(BCONFIG_H) $(GTM_H)           \
        $(SYSTEM_H) coretypes.h $(lang_tree_files)
 build/genchecksum.o : genchecksum.c $(BCONFIG_H) $(SYSTEM_H) $(MD5_H)
 build/gencodes.o : gencodes.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H)   \
@@ -3862,7 +3878,7 @@ mostlyclean: lang.mostlyclean
        -rm -f mddeps.mk
 # Delete other built files.
        -rm -f xsys-protos.hT
-       -rm -f specs.h gencheck.h options.c options.h
+       -rm -f specs.h options.c options.h
 # Delete the stamp and temporary files.
        -rm -f s-* tmp-* stamp-* stmp-*
        -rm -f */stamp-* */tmp-*