[libcpp] Reimplement mkdeps data structures
https://gcc.gnu.org/ml/gcc-patches/2019-05/msg00293.html * include/mkdeps.h (deps_write): Add PHONY arg. (deps_phony_targets): Delete. * init.c (cpp_finish): Just call deps_write. * mkdeps.c (struct mkdeps): Add local vector class. Reimplement vector handling. (munge): Munge to static buffer. (apply_vpath): Adjust vector handling. (deps_init, deps_free): Use new, delete. (deps_add_target): Do not munge here. Record quoting low water mark. (deps_add_dep): Do not munge here. (deps_add_vpath): Adjust vector handling. (make_write_name): New. Munge on demand here. (make_write_vec): New. (deps_phony_targets): Delete. (make_write): New. (deps_write): Forward to deps_Write. (deps_save, deps_restore): Adjust vector handling. From-SVN: r270943
This commit is contained in:
committed by
Nathan Sidwell
parent
7664eeb700
commit
d7b6aee8cd
+3
-8
@@ -764,14 +764,9 @@ cpp_finish (cpp_reader *pfile, FILE *deps_stream)
|
||||
while (pfile->buffer)
|
||||
_cpp_pop_buffer (pfile);
|
||||
|
||||
if (CPP_OPTION (pfile, deps.style) != DEPS_NONE
|
||||
&& deps_stream)
|
||||
{
|
||||
deps_write (pfile->deps, deps_stream, 72);
|
||||
|
||||
if (CPP_OPTION (pfile, deps.phony_targets))
|
||||
deps_phony_targets (pfile->deps, deps_stream);
|
||||
}
|
||||
if (CPP_OPTION (pfile, deps.style) != DEPS_NONE && deps_stream)
|
||||
deps_write (pfile->deps, deps_stream,
|
||||
CPP_OPTION (pfile, deps.phony_targets), 72);
|
||||
|
||||
/* Report on headers that could use multiple include guards. */
|
||||
if (CPP_OPTION (pfile, print_include_names))
|
||||
|
||||
Reference in New Issue
Block a user