From 723cd7abc6c94d4fa8cc4e1428f79e7861c5d99a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 24 Jul 2012 10:31:01 -0700 Subject: Tidy some include usage + dependencies The dwarf2out.c and lto-streamer-in.c files didn't need libfuncs.h in the first place. The libfuncs.h file will grow a use of an optab enumeration and thus will require including optabs.h. * libfuncs.h: Include optabs.h. * dwarf2out.c, lto-streamer.in.c: Don't include libfuncs.h. * Makefile.in (LIBFUNCS_H): Add OPTABS_H. (lto-streamer-in.o, dwarf2out.o): Update deps. From-SVN: r189817 --- gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 16 ++++++++-------- gcc/dwarf2out.c | 1 - gcc/libfuncs.h | 1 + gcc/lto-streamer-in.c | 1 - 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e6479f2..0e54881 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2012-07-24 Richard Henderson + * libfuncs.h: Include optabs.h. + * dwarf2out.c, lto-streamer.in.c: Don't include libfuncs.h. + * Makefile.in (LIBFUNCS_H): Add OPTABS_H. + (lto-streamer-in.o, dwarf2out.o): Update deps. + * optabs.h (unknown_optab): New. * builtins.c (interclass_mathfn_icode): Use it. * dojump.c (do_compare_rtx_and_jump): Likewise. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c688fa5..81dc312 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -971,7 +971,7 @@ GCC_PLUGIN_H = gcc-plugin.h highlev-plugin-common.h plugin.def \ $(CONFIG_H) $(SYSTEM_H) $(HASHTAB_H) PLUGIN_H = plugin.h $(GCC_PLUGIN_H) PLUGIN_VERSION_H = plugin-version.h configargs.h -LIBFUNCS_H = libfuncs.h $(HASHTAB_H) +LIBFUNCS_H = libfuncs.h $(HASHTAB_H) $(OPTABS_H) # # Now figure out from those variables how to compile and link. @@ -2158,9 +2158,9 @@ lto-cgraph.o: lto-cgraph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(EXCEPT_H) $(TIMEVAR_H) pointer-set.h $(LTO_STREAMER_H) \ $(GCOV_IO_H) $(DATA_STREAMER_H) $(TREE_STREAMER_H) lto-streamer-in.o: lto-streamer-in.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) toplev.h $(DIAGNOSTIC_CORE_H) $(EXPR_H) $(FLAGS_H) $(PARAMS_H) input.h \ - $(HASHTAB_H) $(BASIC_BLOCK_H) $(TREE_FLOW_H) $(TREE_PASS_H) $(CGRAPH_H) \ - $(FUNCTION_H) $(GGC_H) $(DIAGNOSTIC_H) $(LIBFUNCS_H) $(EXCEPT_H) debug.h \ + $(TM_H) toplev.h $(DIAGNOSTIC_CORE_H) $(EXPR_H) $(FLAGS_H) $(PARAMS_H) \ + input.h $(HASHTAB_H) $(BASIC_BLOCK_H) $(TREE_FLOW_H) $(TREE_PASS_H) \ + $(CGRAPH_H) $(FUNCTION_H) $(GGC_H) $(DIAGNOSTIC_H) $(EXCEPT_H) debug.h \ $(IPA_UTILS_H) $(LTO_STREAMER_H) toplev.h \ $(DATA_STREAMER_H) $(GIMPLE_STREAMER_H) $(TREE_STREAMER_H) lto-streamer-out.o : lto-streamer-out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ @@ -2794,10 +2794,10 @@ sdbout.o : sdbout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) debug.h \ $(TREE_H) $(GGC_H) $(RTL_H) $(REGS_H) $(FLAGS_H) insn-config.h \ output.h $(DIAGNOSTIC_CORE_H) $(TM_P_H) gsyms.h langhooks.h $(TARGET_H) sdbout.h \ gt-sdbout.h reload.h -dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h dumpfile.h $(TM_H) \ - $(TREE_H) version.h $(RTL_H) $(DWARF2_H) debug.h $(FLAGS_H) insn-config.h \ - output.h $(DIAGNOSTIC_H) hard-reg-set.h $(REGS_H) $(EXPR_H) \ - $(LIBFUNCS_H) toplev.h $(DIAGNOSTIC_CORE_H) $(DWARF2OUT_H) reload.h \ +dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h dumpfile.h \ + $(TM_H) $(TREE_H) version.h $(RTL_H) $(DWARF2_H) debug.h $(FLAGS_H) \ + insn-config.h output.h $(DIAGNOSTIC_H) hard-reg-set.h $(REGS_H) $(EXPR_H) \ + toplev.h $(DIAGNOSTIC_CORE_H) $(DWARF2OUT_H) reload.h \ $(GGC_H) $(EXCEPT_H) dwarf2asm.h $(TM_P_H) langhooks.h $(HASHTAB_H) \ gt-dwarf2out.h $(TARGET_H) $(CGRAPH_H) $(MD5_H) $(INPUT_H) $(FUNCTION_H) \ $(GIMPLE_H) $(TREE_FLOW_H) \ diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index e36a15d..4b67d82 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -72,7 +72,6 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "output.h" #include "expr.h" -#include "libfuncs.h" #include "except.h" #include "dwarf2.h" #include "dwarf2out.h" diff --git a/gcc/libfuncs.h b/gcc/libfuncs.h index b01aed3..bac4918 100644 --- a/gcc/libfuncs.h +++ b/gcc/libfuncs.h @@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see #define GCC_LIBFUNCS_H #include "hashtab.h" +#include "optabs.h" /* Enumeration of indexes into libfunc_table. */ enum libfunc_index diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index c7257d9..b9893a1 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "ggc.h" #include "diagnostic.h" -#include "libfuncs.h" #include "except.h" #include "debug.h" #include "vec.h" -- cgit v1.1