From c3cbfd33bbe1ece62c196d4658d7264d49552553 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sat, 8 Jul 2017 13:40:03 +0000 Subject: [PATCH] Fix coretypes.h-related dependencies The bug fix here is to build/min-insn-modes.o, the rest are related clean-ups. 2017-07-08 Richard Sandiford gcc/ * Makefile.in (HOOKS_H, RTL_BASE_H, FUNCTION_H, EXPR_H, REGS_H) (REAL_H): Remove $(MACHMODE_H). (FIXED_VALUE_H, TREE_CORE_H, CFGLOOP_H): Remove $(MACHMODE_H) and double-int.h. (CORETYPES_H): Add signop.h, wide-int.h, wide-int-print.h, $(MACHMODE_H) and double-int.h. (build/min-insn-modes.o): Depend on $(CORETYPES_H) rather than $(MACHMODE_H). (gengtype-state.o, gengtype.o, build/gengtype.o): Don't depend on double-int.h. From-SVN: r250075 --- gcc/ChangeLog | 13 +++++++++++++ gcc/Makefile.in | 31 ++++++++++++++++--------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 67a827c64c8..f4ef9730600 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2017-07-08 Richard Sandiford + + * Makefile.in (HOOKS_H, RTL_BASE_H, FUNCTION_H, EXPR_H, REGS_H) + (REAL_H): Remove $(MACHMODE_H). + (FIXED_VALUE_H, TREE_CORE_H, CFGLOOP_H): Remove $(MACHMODE_H) and + double-int.h. + (CORETYPES_H): Add signop.h, wide-int.h, wide-int-print.h, + $(MACHMODE_H) and double-int.h. + (build/min-insn-modes.o): Depend on $(CORETYPES_H) rather than + $(MACHMODE_H). + (gengtype-state.o, gengtype.o, build/gengtype.o): Don't depend on + double-int.h. + 2017-07-07 Andrew Pinski * config/aarch64/aarch64.c (aarch_macro_fusion_pair_p): Check diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f32b6456bcb..efca9169671 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -901,17 +901,18 @@ TARGET_H = $(TM_H) target.h $(TARGET_DEF) insn-modes.h insn-codes.h C_TARGET_H = c-family/c-target.h $(C_TARGET_DEF) COMMON_TARGET_H = common/common-target.h $(INPUT_H) $(COMMON_TARGET_DEF) MACHMODE_H = machmode.h mode-classes.def -HOOKS_H = hooks.h $(MACHMODE_H) +HOOKS_H = hooks.h HOSTHOOKS_DEF_H = hosthooks-def.h $(HOOKS_H) LANGHOOKS_DEF_H = langhooks-def.h $(HOOKS_H) TARGET_DEF_H = target-def.h target-hooks-def.h $(HOOKS_H) targhooks.h C_TARGET_DEF_H = c-family/c-target-def.h c-family/c-target-hooks-def.h \ $(TREE_H) $(C_COMMON_H) $(HOOKS_H) common/common-targhooks.h -CORETYPES_H = coretypes.h insn-modes.h insn-modes-inline.h -RTL_BASE_H = $(CORETYPES_H) rtl.h rtl.def $(MACHMODE_H) reg-notes.def \ +CORETYPES_H = coretypes.h insn-modes.h signop.h wide-int.h wide-int-print.h \ + insn-modes-inline.h $(MACHMODE_H) double-int.h +RTL_BASE_H = $(CORETYPES_H) rtl.h rtl.def reg-notes.def \ insn-notes.def $(INPUT_H) $(REAL_H) statistics.h $(VEC_H) \ $(FIXED_VALUE_H) alias.h $(HASHTAB_H) -FIXED_VALUE_H = fixed-value.h $(MACHMODE_H) double-int.h +FIXED_VALUE_H = fixed-value.h RTL_H = $(RTL_BASE_H) $(FLAGS_H) genrtl.h READ_MD_H = $(OBSTACK_H) $(HASHTAB_H) read-md.h PARAMS_H = params.h params-enum.h params.def @@ -921,10 +922,10 @@ BUILTINS_DEF = builtins.def sync-builtins.def omp-builtins.def \ INTERNAL_FN_DEF = internal-fn.def INTERNAL_FN_H = internal-fn.h $(INTERNAL_FN_DEF) TREE_CORE_H = tree-core.h $(CORETYPES_H) all-tree.def tree.def \ - c-family/c-common.def $(lang_tree_files) $(MACHMODE_H) \ + c-family/c-common.def $(lang_tree_files) \ $(BUILTINS_DEF) $(INPUT_H) statistics.h \ $(VEC_H) treestruct.def $(HASHTAB_H) \ - double-int.h alias.h $(SYMTAB_H) $(FLAGS_H) \ + alias.h $(SYMTAB_H) $(FLAGS_H) \ $(REAL_H) $(FIXED_VALUE_H) TREE_H = tree.h $(TREE_CORE_H) tree-check.h REGSET_H = regset.h $(BITMAP_H) hard-reg-set.h @@ -939,12 +940,12 @@ EMIT_RTL_H = emit-rtl.h FLAGS_H = flags.h flag-types.h $(OPTIONS_H) OPTIONS_H = options.h flag-types.h $(OPTIONS_H_EXTRA) FUNCTION_H = function.h $(HASHTAB_H) $(TM_H) hard-reg-set.h \ - $(VEC_H) $(INPUT_H) $(MACHMODE_H) -EXPR_H = expr.h insn-config.h $(FUNCTION_H) $(RTL_H) $(FLAGS_H) $(TREE_H) $(MACHMODE_H) $(EMIT_RTL_H) + $(VEC_H) $(INPUT_H) +EXPR_H = expr.h insn-config.h $(FUNCTION_H) $(RTL_H) $(FLAGS_H) $(TREE_H) \ + $(EMIT_RTL_H) OPTABS_H = optabs.h insn-codes.h insn-opinit.h -REGS_H = regs.h $(MACHMODE_H) hard-reg-set.h -CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) double-int.h \ - $(BITMAP_H) sbitmap.h +REGS_H = regs.h hard-reg-set.h +CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(BITMAP_H) sbitmap.h IPA_UTILS_H = ipa-utils.h $(TREE_H) $(CGRAPH_H) IPA_REFERENCE_H = ipa-reference.h $(BITMAP_H) $(TREE_H) CGRAPH_H = cgraph.h $(VEC_H) $(TREE_H) $(BASIC_BLOCK_H) $(FUNCTION_H) \ @@ -985,7 +986,7 @@ DIAGNOSTIC_H = diagnostic.h $(DIAGNOSTIC_CORE_H) $(PRETTY_PRINT_H) C_PRETTY_PRINT_H = c-family/c-pretty-print.h $(PRETTY_PRINT_H) \ $(C_COMMON_H) $(TREE_H) TREE_INLINE_H = tree-inline.h -REAL_H = real.h $(MACHMODE_H) +REAL_H = real.h LTO_STREAMER_H = lto-streamer.h $(LINKER_PLUGIN_API_H) $(TARGET_H) \ $(CGRAPH_H) $(VEC_H) $(HASH_TABLE_H) $(TREE_H) $(GIMPLE_H) \ $(GCOV_IO_H) $(DIAGNOSTIC_H) alloc-pool.h @@ -2642,7 +2643,7 @@ build/gensupport.o: gensupport.c $(BCONFIG_H) $(SYSTEM_H) \ build/ggc-none.o : ggc-none.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \ $(GGC_H) build/min-insn-modes.o : min-insn-modes.c $(BCONFIG_H) $(SYSTEM_H) \ - $(MACHMODE_H) + $(CORETYPES_H) build/print-rtl.o: print-rtl.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \ $(GTM_H) $(RTL_BASE_H) build/read-md.o: read-md.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \ @@ -2727,12 +2728,12 @@ CFLAGS-gengtype-parse.o += -DHOST_GENERATOR_FILE build/gengtype-parse.o: $(BCONFIG_H) gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ - gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ + gengtype.h errors.h version.h $(HASHTAB_H) $(OBSTACK_H) \ $(XREGEX_H) CFLAGS-gengtype-state.o += -DHOST_GENERATOR_FILE build/gengtype-state.o: $(BCONFIG_H) gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h \ - rtl.def insn-notes.def errors.h double-int.h version.h \ + rtl.def insn-notes.def errors.h version.h \ $(HASHTAB_H) $(OBSTACK_H) $(XREGEX_H) CFLAGS-gengtype.o += -DHOST_GENERATOR_FILE build/gengtype.o: $(BCONFIG_H) -- 2.30.2