diff options
Diffstat (limited to 'gcc/coverage.c')
| -rw-r--r-- | gcc/coverage.c | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/gcc/coverage.c b/gcc/coverage.c index f3a0152ab9b..cd1c13e2d57 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -545,7 +545,9 @@ compute_checksum (void) int coverage_begin_output (void) { - if (no_coverage) + /* We don't need to output .gcno file unless we're under -ftest-coverage + (e.g. -fprofile-arcs/generate/use don't need .gcno to work). */ + if (no_coverage || !flag_test_coverage) return 0; if (!bbg_function_announced) @@ -802,8 +804,7 @@ build_gcov_info (void) tree field, fields = NULL_TREE; tree value = NULL_TREE; tree filename_string; - char *filename; - int filename_len; + int da_file_name_len; unsigned n_fns; const struct function_list *fn; tree string_type; @@ -842,17 +843,11 @@ build_gcov_info (void) field = build_decl (FIELD_DECL, NULL_TREE, string_type); TREE_CHAIN (field) = fields; fields = field; - filename = getpwd (); - filename = (filename && da_file_name[0] != '/' - ? concat (filename, "/", da_file_name, NULL) - : da_file_name); - filename_len = strlen (filename); - filename_string = build_string (filename_len + 1, filename); - if (filename != da_file_name) - free (filename); + da_file_name_len = strlen (da_file_name); + filename_string = build_string (da_file_name_len + 1, da_file_name); TREE_TYPE (filename_string) = build_array_type (char_type_node, build_index_type - (build_int_cst (NULL_TREE, filename_len))); + (build_int_cst (NULL_TREE, da_file_name_len))); value = tree_cons (field, build1 (ADDR_EXPR, string_type, filename_string), value); @@ -979,10 +974,27 @@ void coverage_init (const char *filename) { int len = strlen (filename); + /* + 1 for extra '/', in case prefix doesn't end with /. */ + int prefix_len; + + if (profile_data_prefix == 0 && filename[0] != '/') + profile_data_prefix = getpwd (); + + prefix_len = (profile_data_prefix) ? strlen (profile_data_prefix) + 1 : 0; /* Name of da file. */ - da_file_name = XNEWVEC (char, len + strlen (GCOV_DATA_SUFFIX) + 1); - strcpy (da_file_name, filename); + da_file_name = XNEWVEC (char, len + strlen (GCOV_DATA_SUFFIX) + + prefix_len + 1); + + if (profile_data_prefix) + { + strcpy (da_file_name, profile_data_prefix); + da_file_name[prefix_len - 1] = '/'; + da_file_name[prefix_len] = 0; + } + else + da_file_name[0] = 0; + strcat (da_file_name, filename); strcat (da_file_name, GCOV_DATA_SUFFIX); /* Name of bbg file. */ @@ -990,7 +1002,8 @@ coverage_init (const char *filename) strcpy (bbg_file_name, filename); strcat (bbg_file_name, GCOV_NOTE_SUFFIX); - read_counts_file (); + if (flag_profile_use) + read_counts_file (); } /* Performs file-level cleanup. Close graph file, generate coverage |