c-pragma.c (handle_pragma_weak): Adjust quoting in a diagnostic.

gcc/c-family/ChangeLog:

	* c-pragma.c (handle_pragma_weak): Adjust quoting in a diagnostic.
	* c.opt (-Wformat-diag): Remove a spurious period.

gcc/testsuite/ChangeLog:

	* gcc.dg/weak/weak-19.c: New test.

From-SVN: r271965

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0c3a64407a05a2ceed48cc7037b85dea5fbcf3c7..e74e9258a1c1e79d77590a99f29d51fab4fce036 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-05  Martin Sebor  <msebor@redhat.com>
+
+       * c-pragma.c (handle_pragma_weak): Adjust quoting in a diagnostic.
+       * c.opt (-Wformat-diag): Remove a spurious period.
+
 2019-05-29  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/90628

diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index 480d98efd1ec85ca954f8c00ab09a45dd8892761..62b71d2e4c45d0dcb2b43cb9522ec6845bede2da 100644 (file)
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -361,7 +361,7 @@ handle_pragma_weak (cpp_reader * ARG_UNUSED (dummy))
   if (t == CPP_EQ)
     {
       if (pragma_lex (&value) != CPP_NAME)
-       GCC_BAD ("%<malformed #pragma weak%>, ignored");
+       GCC_BAD ("malformed %<#pragma weak%>, ignored");
       t = pragma_lex (&x);
     }
   if (t != CPP_EOF)

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 046d489f7eb312c81c2b214a49b8714474f6210a..6c247779af6a8a6266f7dee2c687596bd661e49b 100644 (file)
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -564,7 +564,7 @@ Warn about format strings that contain NUL bytes.
 
 Wformat-diag
 C ObjC C++ ObjC++ Var(warn_format_diag) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 1, 0)
-Warn about GCC format strings with strings unsuitable for diagnostics..
+Warn about GCC format strings with strings unsuitable for diagnostics.
 
 Wformat-extra-args
 C ObjC C++ ObjC++ Var(warn_format_extra_args) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 1, 0)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a88fed79de30a77ff3242c8f122e3dce2fac64e..457970ede453408dceac542cd8d8b386d40fd9d5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-05  Martin Sebor  <msebor@redhat.com>
+
+       * gcc.dg/weak/weak-19.c: New test.
+
 2019-06-05  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/specs/discr6.ads: New test.

diff --git a/gcc/testsuite/gcc.dg/weak/weak-19.c b/gcc/testsuite/gcc.dg/weak/weak-19.c
new file mode 100644 (file)
index 0000000..08906b7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/weak/weak-19.c
@@ -0,0 +1,8 @@
+/* { dg-do compile }
+   { dg-require-weak "" } */
+
+/* Verify that the following invalid pragmas are diagnosed.  */
+
+#pragma weak foo = 1   /* { dg-warning "malformed '#pragma weak'" } */
+#pragma weak foo = +   /* { dg-warning "malformed '#pragma weak'" } */
+#pragma weak foo = ?   /* { dg-warning "malformed '#pragma weak'" } */