re PR c/21668 (gratuitous warning about "extern const" with initializer)

        PR c/21668
        * c-decl.c (grokdeclarator): Don't warn for 'extern const' when
        compiling at the intersection of C and C++.

testsuite/
        PR c/21668
        * gcc.dg/Wc++-compat.c: New.
        * gcc.dg/Wno-c++-compat.c: New.

From-SVN: r107401

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 003b813fc7d5f579d5156902eab4e8425bed7435..a86cfdc01b64e43b733eb2d4f4c840f9e4f8df74 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -4014,8 +4014,13 @@ grokdeclarator (const struct c_declarator *declarator,
           && !funcdef_flag)
     {
       /* 'extern' with initialization is invalid if not at file scope.  */
-      if (current_scope == file_scope)
-       warning (0, "%qs initialized and declared %<extern%>", name);
+       if (current_scope == file_scope)
+         {
+           /* It is fine to have 'extern const' when compiling at C
+              and C++ intersection.  */
+           if (!(warn_cxx_compat && constp))
+             warning (0, "%qs initialized and declared %<extern%>", name);
+         }
       else
        error ("%qs has both %<extern%> and initializer", name);
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bfc1d95c446b3b956ce2b3093943953b264f87fe..f33e8337f9fe3909d65a151d5b6f4b6884186838 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-23  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       PR c/21668
+       * gcc.dg/Wc++-compat.c: New.
+       * gcc.dg/Wno-c++-compat.c: New.
+
 2005-11-23  Alan Modra  <amodra@bigpond.net.au>
 
        * gcc.target/powerpc/altivec-consts.c (vspltisb): Use int val.

diff --git a/gcc/testsuite/gcc.dg/Wc++-compat.c b/gcc/testsuite/gcc.dg/Wc++-compat.c
new file mode 100644 (file)
index 0000000..aa435be
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wc++-compat.c
@@ -0,0 +1,9 @@
+/* Copyright (C) 2005  Free Software Foundation.
+
+   by Gabriel Dos Reis  <gdr@integrable-solutions.net>  */
+
+/* { dg-do compile }  */
+/* { dg-options "-Wc++-compat" } */
+
+extern const int foo = 42;
+

diff --git a/gcc/testsuite/gcc.dg/Wno-c++-compat.c b/gcc/testsuite/gcc.dg/Wno-c++-compat.c
new file mode 100644 (file)
index 0000000..b1f3cf2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wno-c++-compat.c
@@ -0,0 +1,9 @@
+/* Copyright (C) 2005  Free Software Foundation.
+
+   by Gabriel Dos Reis  <gdr@integrable-solutions.net>  */
+
+/* { dg-do compile }  */
+/* { dg-options "-Wno-c++-compat" } */
+
+extern const int foo = 42;      /* { dg-error "initialized and declared" } */
+