summaryrefslogtreecommitdiff
path: root/gcc/gcov-tool.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-01-30 16:15:00 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2015-01-30 16:15:00 +0000
commit40fecdd62f7d293a214dd71b81de5e0f1099bba7 (patch)
tree205b68f7ca81a40e0ec33999911c7cd124be49b1 /gcc/gcov-tool.c
parent4811c44ee01bba9fd09fe5e2b6b9fc9be66b33c9 (diff)
downloadgcc-40fecdd62f7d293a214dd71b81de5e0f1099bba7.tar.gz
Always pass explicit location to fatal_error.
The patch <https://gcc.gnu.org/ml/gcc-patches/2014-11/msg00698.html> adding an overload for fatal_error that passes an explicit location broke gcc.pot regeneration because xgettext cannot handle function overloads with the diagnostic string argument in different positions. As the desired direction is for all diagnostics to have explicit locations, this patch addresses the regression by removing the version of fatal_error that does not pass a location, passing explicit input_location everywhere (in the hope that those will incrementally be changed to other locations, much as with the addition of a location argument to pedwarn some time ago - a lot of cases aren't meaningfully associated with a source file so UNKNOWN_LOCATION may be better). Note that this patch does not attempt to fix any existing issues with these diagnostics (such as wrongly starting with capital letters or ending with '.' or '\n'); it just adds the input_location argument. Bootstrapped with no regressions for x86_64-unknown-linux-gnu (Go excluded). gcc: * diagnostic.c (fatal_error (const char *, ...)): Remove function. * diagnostic-core.h (fatal_error (const char *, ...)): Remove prototype. * toplev.h (init_asm_output): Update comment on use of UNKNOWN_LOCATION with fatal_error. * cgraph.c, collect-utils.c, collect2.c, config/arc/arc.c, config/arc/arc.md, config/avr/avr.c, config/c6x/c6x.h, config/darwin.c, config/host-darwin.c, config/i386/host-cygwin.c, config/i386/intelmic-mkoffload.c, config/nios2/nios2.c, config/nvptx/mkoffload.c, config/nvptx/nvptx.h, config/rs6000/host-darwin.c, config/rs6000/rs6000.c, config/s390/s390.c, gcc.c, gcov-io.h, gcov-tool.c, ggc-common.c, ggc-page.c, graph.c, ipa-inline-analysis.c, ipa-reference.c, lto-cgraph.c, lto-section-in.c, lto-streamer-in.c, lto-streamer.c, lto-wrapper.c, objc/objc-act.c, opts.c, passes.c, plugin.c, tlink.c, toplev.c, tree-streamer-in.c, varpool.c: All callers of fatal_error changed to pass input_location as first argument. gcc/c-family: * c-opts.c, c-pch.c, cppspec.c: All callers of fatal_error changed to pass input_location as first argument. gcc/cp: * class.c, except.c, parser.c, pt.c: All callers of fatal_error changed to pass input_location as first argument. gcc/fortran: * f95-lang.c, gfortranspec.c, trans-const.c, trans-expr.c: All callers of fatal_error changed to pass input_location as first argument. gcc/java: * class.c, expr.c, jcf-parse.c, jvspec.c: All callers of fatal_error changed to pass input_location as first argument. gcc/lto: * lto-object.c, lto-symtab.c, lto.c: All callers of fatal_error changed to pass input_location as first argument. libcc1: * plugin.cc: All callers of fatal_error changed to pass input_location as first argument. From-SVN: r220293
Diffstat (limited to 'gcc/gcov-tool.c')
-rw-r--r--gcc/gcov-tool.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c
index 7de175fdfcc..0f97b532d7f 100644
--- a/gcc/gcov-tool.c
+++ b/gcc/gcov-tool.c
@@ -65,7 +65,7 @@ unlink_gcda_file (const char *name,
ret = remove (name);
if (ret)
- fatal_error ("error in removing %s\n", name);
+ fatal_error (input_location, "error in removing %s\n", name);
return ret;
}
@@ -95,7 +95,7 @@ gcov_output_files (const char *out, struct gcov_info *profile)
#else
if (mkdir (out) == -1 && errno != EEXIST)
#endif
- fatal_error ("Cannot make directory %s", out);
+ fatal_error (input_location, "Cannot make directory %s", out);
} else
unlink_profile_dir (out);
@@ -103,17 +103,17 @@ gcov_output_files (const char *out, struct gcov_info *profile)
pwd = getcwd (NULL, 0);
if (pwd == NULL)
- fatal_error ("Cannot get current directory name");
+ fatal_error (input_location, "Cannot get current directory name");
ret = chdir (out);
if (ret)
- fatal_error ("Cannot change directory to %s", out);
+ fatal_error (input_location, "Cannot change directory to %s", out);
gcov_do_dump (profile, 0);
ret = chdir (pwd);
if (ret)
- fatal_error ("Cannot change directory to %s", pwd);
+ fatal_error (input_location, "Cannot change directory to %s", pwd);
free (pwd);
}
@@ -207,7 +207,7 @@ do_merge (int argc, char **argv)
case 'w':
sscanf (optarg, "%d,%d", &w1, &w2);
if (w1 < 0 || w2 < 0)
- fatal_error ("weights need to be non-negative\n");
+ fatal_error (input_location, "weights need to be non-negative\n");
break;
default:
merge_usage ();
@@ -350,7 +350,7 @@ do_rewrite (int argc, char **argv)
}
if (scale < 0.0)
- fatal_error ("scale needs to be non-negative\n");
+ fatal_error (input_location, "scale needs to be non-negative\n");
if (normalize_val != 0)
{