aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2013-05-14 21:41:13 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2013-05-14 21:41:13 +0200
commit2e55d0628102889d377feec36ca7699abd8afb1e (patch)
tree50066c3c945d19582e3fdbecbc893fc4ec2ebcc2 /gcc
parent0bfdb81e695faaef4cef9f8c844460c76c297669 (diff)
downloadgcc-2e55d0628102889d377feec36ca7699abd8afb1e.zip
gcc-2e55d0628102889d377feec36ca7699abd8afb1e.tar.gz
gcc-2e55d0628102889d377feec36ca7699abd8afb1e.tar.bz2
tree.c (warn_deprecated_use): Print file:line using locus color.
* tree.c (warn_deprecated_use): Print file:line using locus color. * diagnostic.c (diagnostic_report_current_module): Print file:line and file:line:column using locus color. From-SVN: r198900
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/diagnostic.c6
-rw-r--r--gcc/tree.c24
3 files changed, 21 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a2469f..33c2491 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-14 Jakub Jelinek <jakub@redhat.com>
+
+ * tree.c (warn_deprecated_use): Print file:line using locus color.
+ * diagnostic.c (diagnostic_report_current_module): Print file:line
+ and file:line:column using locus color.
+
2013-05-14 Mike Stump <mikestump@comcast.net>
* gdbinit.in: Add __null.
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index f9a236b..2ec9620 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -517,18 +517,18 @@ diagnostic_report_current_module (diagnostic_context *context, location_t where)
map = INCLUDED_FROM (line_table, map);
if (context->show_column)
pp_verbatim (context->printer,
- "In file included from %s:%d:%d",
+ "In file included from %r%s:%d:%d%R", "locus",
LINEMAP_FILE (map),
LAST_SOURCE_LINE (map), LAST_SOURCE_COLUMN (map));
else
pp_verbatim (context->printer,
- "In file included from %s:%d",
+ "In file included from %r%s:%d%R", "locus",
LINEMAP_FILE (map), LAST_SOURCE_LINE (map));
while (! MAIN_FILE_P (map))
{
map = INCLUDED_FROM (line_table, map);
pp_verbatim (context->printer,
- ",\n from %s:%d",
+ ",\n from %r%s:%d%R", "locus",
LINEMAP_FILE (map), LAST_SOURCE_LINE (map));
}
pp_verbatim (context->printer, ":");
diff --git a/gcc/tree.c b/gcc/tree.c
index d4e85e1..62909b0 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -11715,12 +11715,12 @@ warn_deprecated_use (tree node, tree attr)
expanded_location xloc = expand_location (DECL_SOURCE_LOCATION (node));
if (msg)
warning (OPT_Wdeprecated_declarations,
- "%qD is deprecated (declared at %s:%d): %s",
- node, xloc.file, xloc.line, msg);
+ "%qD is deprecated (declared at %r%s:%d%R): %s",
+ node, "locus", xloc.file, xloc.line, msg);
else
warning (OPT_Wdeprecated_declarations,
- "%qD is deprecated (declared at %s:%d)",
- node, xloc.file, xloc.line);
+ "%qD is deprecated (declared at %r%s:%d%R)",
+ node, "locus", xloc.file, xloc.line);
}
else if (TYPE_P (node))
{
@@ -11744,23 +11744,23 @@ warn_deprecated_use (tree node, tree attr)
{
if (msg)
warning (OPT_Wdeprecated_declarations,
- "%qE is deprecated (declared at %s:%d): %s",
- what, xloc.file, xloc.line, msg);
+ "%qE is deprecated (declared at %r%s:%d%R): %s",
+ what, "locus", xloc.file, xloc.line, msg);
else
warning (OPT_Wdeprecated_declarations,
- "%qE is deprecated (declared at %s:%d)", what,
- xloc.file, xloc.line);
+ "%qE is deprecated (declared at %r%s:%d%R)",
+ what, "locus", xloc.file, xloc.line);
}
else
{
if (msg)
warning (OPT_Wdeprecated_declarations,
- "type is deprecated (declared at %s:%d): %s",
- xloc.file, xloc.line, msg);
+ "type is deprecated (declared at %r%s:%d%R): %s",
+ "locus", xloc.file, xloc.line, msg);
else
warning (OPT_Wdeprecated_declarations,
- "type is deprecated (declared at %s:%d)",
- xloc.file, xloc.line);
+ "type is deprecated (declared at %r%s:%d%R)",
+ "locus", xloc.file, xloc.line);
}
}
else