Imported gcc-4.4.3

[msp430-gcc.git] / gcc / c-errors.c

diff --git a/gcc/c-errors.c b/gcc/c-errors.c
index 3f030f9a255fe00504fd1a39412a1cc10480fea1..bee534c44fe5c6cd3d19d311383f6e452cfa1c57 100644 (file)
--- a/gcc/c-errors.c
+++ b/gcc/c-errors.c
@@ -1,12 +1,12 @@
 /* Various diagnostic subroutines for the GNU C language.
 /* Various diagnostic subroutines for the GNU C language.

-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.

    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,12 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"

+#include "coretypes.h"
+#include "tm.h"

 #include "tree.h"
 #include "c-tree.h"
 #include "tm_p.h"
 #include "tree.h"
 #include "c-tree.h"
 #include "tm_p.h"


@@ -30,15 +31,34 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* Issue an ISO C99 pedantic warning MSGID.  */
 
 void
 /* Issue an ISO C99 pedantic warning MSGID.  */
 
 void

-pedwarn_c99 VPARAMS ((const char *msgid, ...))
+pedwarn_c99 (location_t location, int opt, const char *gmsgid, ...)

 {
 {

-  diagnostic_context dc;
+  diagnostic_info diagnostic;
+  va_list ap;

 
 

-  VA_OPEN (ap, msgid);
-  VA_FIXEDARG (ap, const char *, msgid);
+  va_start (ap, gmsgid);
+  diagnostic_set_info (&diagnostic, gmsgid, &ap, location,
+                      flag_isoc99 ? DK_PEDWARN : DK_WARNING);
+  diagnostic.option_index = opt;
+  report_diagnostic (&diagnostic);
+  va_end (ap);
+}
+
+/* Issue an ISO C90 pedantic warning MSGID.  This function is supposed to
+   be used for matters that are allowed in ISO C99 but not supported in
+   ISO C90, thus we explicitly don't pedwarn when C99 is specified.
+   (There is no flag_c90.)  */
+
+void
+pedwarn_c90 (location_t location, int opt, const char *gmsgid, ...)
+{
+  diagnostic_info diagnostic;
+  va_list ap;

 
 

-  set_diagnostic_context (&dc, msgid, &ap, input_filename, lineno,
-                          !flag_isoc99 || !flag_pedantic_errors);
-  report_diagnostic (&dc);
-  VA_CLOSE (ap);
+  va_start (ap, gmsgid);
+  diagnostic_set_info (&diagnostic, gmsgid, &ap, location,
+                      flag_isoc99 ? DK_WARNING : DK_PEDWARN);
+  diagnostic.option_index = opt;
+  report_diagnostic (&diagnostic);
+  va_end (ap);

 }
 }