From 9b68b6ea7f378adba54d910340277e8c6d022a6c Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 10 Jun 2010 20:23:23 +0000 Subject: Makefile.in (BUILD_RTL): Move build/read-md.o to... gcc/ * Makefile.in (BUILD_RTL): Move build/read-md.o to... (BUILD_MD): ...this new variable. (simple_generated_rtl_h, simple_generated_rtl_c): New variables that include the old contents of simple_generated_h and simple_generated_c. (simple_generated_h, simple_generated_c): Include them. Add insn-constants.h. (s-%): Make simple_generated_{h,c} stamps depend on $(MD_DEPS) and simple_generated_rtl_{h,c} stamps depend on insn-conditions.md. Remove these dependencies from the main rule and include insn-conditions.md in the command line only if it appears in the dependency list. (insn-constants.h, s-constants): Delete. (build/genconstants.o): Don't depend on $(RTL_BASE_H), $(GTM_H) or gensupport.h. (build/genmddeps.o): Likewise. (genprogrtl): New variable that contains everything from genprogmd except mddeps and constants. (genprogmd): Redefine in terms of genprogrtl. Make these programs depend on $(BUILD_MD) (genprog): New variable. Make these programs depend on $(BUILD_ERRORS). * genmddeps.c: Don't include tm.h, rtl.h or gensupport.h. (main): Use read_md_files instead of init_rtx_reader_args. * genconstants.c: As for genmddeps.c. * read-md.h (read_skip_construct): Declare. * read-md.c (read_skip_construct): New function. (handle_file): Allow a null handle_directive, skipping the construct if so. (parse_include): Update the comment accordingly. From-SVN: r160578 --- gcc/genconstants.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gcc/genconstants.c') diff --git a/gcc/genconstants.c b/gcc/genconstants.c index e5f083a..60526bb 100644 --- a/gcc/genconstants.c +++ b/gcc/genconstants.c @@ -28,11 +28,8 @@ along with GCC; see the file COPYING3. If not see #include "bconfig.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "rtl.h" #include "errors.h" #include "read-md.h" -#include "gensupport.h" /* Called via traverse_md_constants; emit a #define for the current constant definition. */ @@ -52,7 +49,7 @@ main (int argc, char **argv) { progname = "genconstants"; - if (!init_rtx_reader_args (argc, argv)) + if (!read_md_files (argc, argv, NULL, NULL)) return (FATAL_EXIT_CODE); /* Initializing the MD reader has the side effect of loading up -- cgit v1.1