wchar_t now gets wrapped inside "ifndef __cplusplus",

[pf3gnuchains/gcc-fork.git] / gcc / cppspec.c

diff --git a/gcc/cppspec.c b/gcc/cppspec.c
index 2908b73..e5ad4e4 100644 (file)
--- a/gcc/cppspec.c
+++ b/gcc/cppspec.c
@@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
+#include "gcc.h"
 
 /* The `cpp' executable installed in $(bindir) and $(cpp_install_dir)
    is a customized version of the gcc driver.  It forces -E; -S and -c
@@ -51,7 +52,8 @@ Boston, MA 02111-1307, USA.  */
   || !strcmp (STR, "imacros") || !strcmp (STR, "aux-info") \
   || !strcmp (STR, "idirafter") || !strcmp (STR, "iprefix") \
   || !strcmp (STR, "iwithprefix") || !strcmp (STR, "iwithprefixbefore") \
-  || !strcmp (STR, "isystem") || !strcmp (STR, "specs"))
+  || !strcmp (STR, "isystem") || !strcmp (STR, "specs") \
+  || !strcmp (STR, "MF") || !strcmp (STR, "MT") || !strcmp (STR, "MQ"))
 
 #ifndef WORD_SWITCH_TAKES_ARG
 #define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR)
@@ -69,21 +71,23 @@ static const char *const known_suffixes[] =
 
 /* Filter argc and argv before processing by the gcc driver proper. */
 void
-lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
-     void (*errfn) PVPROTO((const char *, ...));
+lang_specific_driver (in_argc, in_argv, in_added_libraries)
      int *in_argc;
-     char ***in_argv;
+     const char *const **in_argv;
      int *in_added_libraries ATTRIBUTE_UNUSED;
 {
   int argc = *in_argc;
-  char **argv = *in_argv;
-  
+  const char *const *argv = *in_argv;
+
   /* Do we need to read stdin? */
   int read_stdin = 1;
 
   /* Do we need to insert -E? */
   int need_E = 1;
 
+  /* Do we need to insert -no-gcc? */
+  int need_no_gcc = 1;
+
   /* Have we seen an input file? */
   int seen_input = 0;
   
@@ -96,8 +100,8 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
   /* Do we need to fix up an input file with an unrecognized suffix? */
   int need_fixups = 1;
   
-  int i, j, quote;
-  char **new_argv;
+  int i, j, quote = 0;
+  const char **new_argv;
   int new_argc;
 
   /* First pass.  If we see an -S or -c, barf.  If we see an input file,
@@ -121,8 +125,8 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
                need_E = 0;
              else if (argv[i][1] == 'S' || argv[i][1] == 'c')
                {
-                 (*errfn) ("`%s' is not a legal option to the preprocessor",
-                           argv[i]);
+                 fatal ("\"%s\" is not a valid option to the preprocessor",
+                        argv[i]);
                  return;
                }
              else if (argv[i][1] == 'x')
@@ -135,6 +139,8 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
            }
          else if (argv[i][1] == 'x')
            need_fixups = 0;
+         else if (argv[i][1] == 'g' && !strcmp(&argv[i][2], "cc"))
+           need_no_gcc = 0;
          else if (WORD_SWITCH_TAKES_ARG (&argv[i][1]))
            quote = 1;
        }
@@ -143,7 +149,7 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
          seen_input++;
          if (seen_input == 3)
            {
-             (*errfn) ("too many input files");
+             fatal ("too many input files");
              return;
            }
          else if (seen_input == 2)
@@ -183,13 +189,14 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
 
   /* If we don't need to edit the command line, we can bail early.  */
 
-  new_argc = argc + need_E + read_stdin
+  new_argc = argc + need_E + need_no_gcc + read_stdin
     + !!o_here + !!lang_c_here + !!lang_S_here;
 
   if (new_argc == argc)
     return;
 
-  new_argv = xmalloc (new_argc * sizeof(char *));
+  /* One more slot for a terminating null.  */
+  new_argv = (const char **) xmalloc ((new_argc + 1) * sizeof(char *));
 
   new_argv[0] = argv[0];
   j = 1;
@@ -197,6 +204,9 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
   if (need_E)
     new_argv[j++] = "-E";
 
+  if (need_no_gcc)
+    new_argv[j++] = "-no-gcc";
+
   for (i = 1; i < argc; i++, j++)
     {
       if (i == lang_c_here)
@@ -210,8 +220,9 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
     }
 
   if (read_stdin)
-    new_argv[j] = "-";
+    new_argv[j++] = "-";
 
+  new_argv[j] = NULL;
   *in_argc = new_argc;
   *in_argv = new_argv;
 }