summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2019-04-12 16:12:49 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2019-04-12 16:12:49 +0000
commit1ef6e17fbf7d6a6cbeba6988a285f6dfd10a031c (patch)
tree2533411ba3f477a4d19dd3658f690866b32bd96d
parent01e345e068048d6d11e8b2ec2c5a0604503f06f2 (diff)
PR translation/90041
* exgettext: Print MissingArgError, UnknownError or Warn *.opt argument using error or warning instead of _ to mark it as gcc-internal-format. * c.opt (-fhandle-exceptions): Use %< and %> around option names in the Warn diagnostics. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@270321 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c.opt2
-rw-r--r--gcc/po/ChangeLog5
-rw-r--r--gcc/po/exgettext6
4 files changed, 13 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index aeba529b2325..aeceba7beebb 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,9 @@
2019-04-12 Jakub Jelinek <jakub@redhat.com>
+ PR translation/90041
+ * c.opt (-fhandle-exceptions): Use %< and %> around option names
+ in the Warn diagnostics.
+
PR c/89946
* c-attribs.c (handle_patchable_function_entry_attribute): Add
function comment. Warn if arguments of the attribute are not positive
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 0f39ebb3adaa..916cc67b453f 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1516,7 +1516,7 @@ fguiding-decls
C++ ObjC++ Deprecated
fhandle-exceptions
-C++ ObjC++ Optimization Alias(fexceptions) Warn({-fhandle-exceptions has been renamed -fexceptions (and is now on by default)})
+C++ ObjC++ Optimization Alias(fexceptions) Warn({%<-fhandle-exceptions%> has been renamed %<-fexceptions%> (and is now on by default)})
fhonor-std
C++ ObjC++ Deprecated
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index e34a9ae8411c..b94bb09ca09a 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,5 +1,10 @@
2019-04-12 Jakub Jelinek <jakub@redhat.com>
+ PR translation/90041
+ * exgettext: Print MissingArgError, UnknownError or Warn
+ *.opt argument using error or warning instead of _ to mark it
+ as gcc-internal-format.
+
* de.po, sv.po: Update.
2019-04-02 Iain Buclaw <ibuclaw@gdcproject.org>
diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index 22bebe4f9ee4..ed6935070abc 100644
--- a/gcc/po/exgettext
+++ b/gcc/po/exgettext
@@ -252,7 +252,7 @@ echo "scanning option files..." >&2
} else
sub("\\).*", "", line)
printf("#line %d \"%s\"\n", lineno, file)
- printf("_(\"%s\")\n", line)
+ printf("error(\"%s\")\n", line)
}
if ((field == 1) && /UnknownError/) {
line = $0
@@ -263,7 +263,7 @@ echo "scanning option files..." >&2
} else
sub("\\).*", "", line)
printf("#line %d \"%s\"\n", lineno, file)
- printf("_(\"%s\")\n", line)
+ printf("error(\"%s\")\n", line)
}
if ((field == 1) && /Warn\(/) {
line = $0
@@ -274,7 +274,7 @@ echo "scanning option files..." >&2
} else
sub("\\).*", "", line)
printf("#line %d \"%s\"\n", lineno, file)
- printf("_(\"%s\")\n", line)
+ printf("warning(0, \"%s\")\n", line)
}
if (field == 2) {
line = $0