diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-01-06 00:15:29 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-01-06 00:15:29 +0000 |
| commit | f7114e1750e9f65412cade6e7740b65cba27ac25 (patch) | |
| tree | dfcf1a323ecd306223b732c5c47577888caad329 /gcc/cppinit.c | |
| parent | a64761a3cab9218b7fd6ad7fb6ef9b8eb997ba87 (diff) | |
| download | gcc-f7114e1750e9f65412cade6e7740b65cba27ac25.zip gcc-f7114e1750e9f65412cade6e7740b65cba27ac25.tar.gz gcc-f7114e1750e9f65412cade6e7740b65cba27ac25.tar.bz2 | |
cpp.texi: Update for -MQ.
* cpp.texi: Update for -MQ.
* cppinit.c (cpp_create_reader): Always create pfile->deps.
(cpp_cleanup): Always free pfile->deps.
(initialize_dependency_output): Don't create pfile->deps.
(cpp_handle_option): Similarly.
(OPT_MQ): New.
* gcc.c (cpp_options): Handle -MQ.
(DEFAULT_WORD_SWITCH_TAKES_ARG): Add -MQ.
* mkdeps.c (base_name): Remove.
(deps_init): Don't allocate vector space until it's needed.
(deps_free): Only free vectors if allocated.
(deps_add_target, deps_add_dep): Update for initial allocation.
(deps_add_default_target): Don't strip to the base_name.
From-SVN: r38735
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 7454b6f..b0c00ae 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -499,6 +499,10 @@ cpp_create_reader (lang) /* After creating pfile->pending. */ set_lang (pfile, lang); + /* It's simplest to just create this struct whether or not it will + be needed. */ + pfile->deps = deps_init (); + /* Initialize lexer state. */ pfile->state.save_comments = ! CPP_OPTION (pfile, discard_comments); @@ -552,8 +556,7 @@ cpp_cleanup (pfile) if (pfile->macro_buffer) free ((PTR) pfile->macro_buffer); - if (pfile->deps) - deps_free (pfile->deps); + deps_free (pfile->deps); _cpp_cleanup_includes (pfile); _cpp_cleanup_stacks (pfile); @@ -753,9 +756,6 @@ initialize_dependency_output (pfile) return; } - if (! pfile->deps) - pfile->deps = deps_init (); - /* Find the space before the DEPS_TARGET, if there is one. */ s = strchr (spec, ' '); if (s) @@ -1083,6 +1083,7 @@ new_pending_directive (pend, text, handler) DEF_OPT("MM", 0, OPT_MM) \ DEF_OPT("MMD", no_fil, OPT_MMD) \ DEF_OPT("MP", 0, OPT_MP) \ + DEF_OPT("MQ", no_tgt, OPT_MQ) \ DEF_OPT("MT", no_tgt, OPT_MT) \ DEF_OPT("P", 0, OPT_P) \ DEF_OPT("U", no_mac, OPT_U) \ @@ -1494,9 +1495,6 @@ cpp_handle_option (pfile, argc, argv) case OPT_MD: case OPT_MM: case OPT_MMD: - if (! pfile->deps) - pfile->deps = deps_init (); - if (opt_code == OPT_M || opt_code == OPT_MD) CPP_OPTION (pfile, print_deps) = 2; else @@ -1515,11 +1513,10 @@ cpp_handle_option (pfile, argc, argv) CPP_OPTION (pfile, deps_phony_targets) = 1; break; + case OPT_MQ: case OPT_MT: - /* Add a target. */ - if (! pfile->deps) - pfile->deps = deps_init (); - deps_add_target (pfile->deps, arg, 0); + /* Add a target. -MQ quotes for Make. */ + deps_add_target (pfile->deps, arg, opt_code == OPT_MQ); break; case OPT_A: |