From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11130 invoked by alias); 19 Jul 2012 18:24:44 -0000 Received: (qmail 11032 invoked by uid 22791); 19 Jul 2012 18:24:40 -0000 X-SWARE-Spam-Status: No, hits=-4.8 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Jul 2012 18:24:20 +0000 Received: by pbbrq2 with SMTP id rq2so4805614pbb.20 for ; Thu, 19 Jul 2012 11:24:19 -0700 (PDT) Received: by 10.68.197.70 with SMTP id is6mr7272019pbc.64.1342722259647; Thu, 19 Jul 2012 11:24:19 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id ip5sm2241692pbc.3.2012.07.19.11.24.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Jul 2012 11:24:19 -0700 (PDT) From: Richard Henderson To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/4] Tidy some include usage + dependencies Date: Thu, 19 Jul 2012 18:24:00 -0000 Message-Id: <1342722250-25934-3-git-send-email-rth@redhat.com> In-Reply-To: <1342722250-25934-1-git-send-email-rth@redhat.com> References: <1342722250-25934-1-git-send-email-rth@redhat.com> X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2012-07/txt/msg00934.txt.bz2 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. --- gcc/Makefile.in | 16 ++++++++-------- gcc/dwarf2out.c | 1 - gcc/libfuncs.h | 1 + gcc/lto-streamer-in.c | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index d48c696..06b8179 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 d4b6831..b60c4ce 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 07ae2b3..89e337c 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" -- 1.7.7.6