X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcppspec.c;h=5f787d61c8dbbe8cfaa97a4b98c9386a78e6e048;hb=bb9594ed71fc9d4d347495ae70cb925196c0da46;hp=01273054005af2e45213cf890125c1844a5c03ca;hpb=9e1893a78dcf2e2c3a46a535dbd443dd190f8f63;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/cppspec.c b/gcc/cppspec.c
index 01273054005..5f787d61c8d 100644
--- a/gcc/cppspec.c
+++ b/gcc/cppspec.c
@@ -1,32 +1,33 @@
 /* Specific flags and argument handling of the C preprocessor.
    Copyright (C) 1999 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC 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 version.
+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
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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
-along with GNU CC; 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 COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, 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
    are errors.  It defaults to -x c for files with unrecognized
    extensions, unless -x options appear in argv, in which case we
    assume the user knows what they're doing.  If no explicit input is
-   mentioned, it will read stdin. */
+   mentioned, it will read stdin.  */
 
 /* Snarfed from gcc.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)
@@ -67,17 +69,16 @@ static const char *const known_suffixes[] =
   NULL
 };
 
-/* Filter argc and argv before processing by the gcc driver proper. */
+/* 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;
 
@@ -91,7 +92,7 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
   int seen_input = 0;
   
   /* Positions to insert -xc, -xassembler-with-cpp, and -o, if necessary.
-     0 means unnecessary. */
+     0 means unnecessary.  */
   int lang_c_here = 0;
   int lang_S_here = 0;
   int o_here = 0;
@@ -99,9 +100,12 @@ 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;
+  extern int is_cpp_driver;
+
+  is_cpp_driver = 1;
 
   /* First pass.  If we see an -S or -c, barf.  If we see an input file,
      turn off read_stdin.  If we see a second input file, it is actually
@@ -124,8 +128,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')
@@ -148,7 +152,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)
@@ -195,7 +199,7 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
     return;
 
   /* One more slot for a terminating null.  */
-  new_argv = (char **) xmalloc ((new_argc + 1) * sizeof(char *));
+  new_argv = (const char **) xmalloc ((new_argc + 1) * sizeof(char *));
 
   new_argv[0] = argv[0];
   j = 1;
@@ -226,11 +230,11 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
   *in_argv = new_argv;
 } 
 
-/* Called before linking.  Returns 0 on success and -1 on failure. */
+/* Called before linking.  Returns 0 on success and -1 on failure.  */
 int lang_specific_pre_link ()
 {
-  return 0;  /* Not used for cpp. */
+  return 0;  /* Not used for cpp.  */
 }
 
-/* Number of extra output files that lang_specific_pre_link may generate. */
-int lang_specific_extra_outfiles = 0;  /* Not used for cpp. */
+/* Number of extra output files that lang_specific_pre_link may generate.  */
+int lang_specific_extra_outfiles = 0;  /* Not used for cpp.  */