X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcppspec.c;h=f53cff2a5c1a3d0d29395b67839022b01f988244;hb=648298e892dac93092649dbe92a8865adbe51748;hp=ef7238953fd779975603483ccc9eee3bb40b7223;hpb=805e22b2051e9c6a75377ea6599654d7415da483;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/cppspec.c b/gcc/cppspec.c
index ef7238953fd..f53cff2a5c1 100644
--- a/gcc/cppspec.c
+++ b/gcc/cppspec.c
@@ -31,32 +31,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    assume the user knows what they're doing.  If no explicit input is
    mentioned, it will read stdin.  */
 
-/* Snarfed from gcc.c: */
-
-/* This defines which switch letters take arguments.  */
-
-#define DEFAULT_SWITCH_TAKES_ARG(CHAR) \
-  ((CHAR) == 'D' || (CHAR) == 'U' || (CHAR) == 'o' \
-   || (CHAR) == 'e' || (CHAR) == 'T' || (CHAR) == 'u' \
-   || (CHAR) == 'I' || (CHAR) == 'm' || (CHAR) == 'x' \
-   || (CHAR) == 'L' || (CHAR) == 'A' || (CHAR) == 'V' \
-   || (CHAR) == 'B' || (CHAR) == 'b')
-
 #ifndef SWITCH_TAKES_ARG
 #define SWITCH_TAKES_ARG(CHAR) DEFAULT_SWITCH_TAKES_ARG(CHAR)
 #endif
 
-/* This defines which multi-letter switches take arguments.  */
-
-#define DEFAULT_WORD_SWITCH_TAKES_ARG(STR)		\
- (!strcmp (STR, "Tdata") || !strcmp (STR, "Ttext")	\
-  || !strcmp (STR, "Tbss") || !strcmp (STR, "include")	\
-  || !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, "MF") || !strcmp (STR, "MT") || !strcmp (STR, "MQ"))
-
 #ifndef WORD_SWITCH_TAKES_ARG
 #define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR)
 #endif
@@ -73,10 +51,8 @@ static const char *const known_suffixes[] =
 
 /* Filter argc and argv before processing by the gcc driver proper.  */
 void
-lang_specific_driver (in_argc, in_argv, in_added_libraries)
-     int *in_argc;
-     const char *const **in_argv;
-     int *in_added_libraries ATTRIBUTE_UNUSED;
+lang_specific_driver (int *in_argc, const char *const **in_argv,
+		      int *in_added_libraries ATTRIBUTE_UNUSED)
 {
   int argc = *in_argc;
   const char *const *argv = *in_argv;
@@ -87,9 +63,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
   /* 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;
 
@@ -144,8 +117,6 @@ lang_specific_driver (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;
 	}
@@ -194,14 +165,14 @@ lang_specific_driver (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 + need_no_gcc + read_stdin
+  new_argc = argc + need_E + read_stdin
     + !!o_here + !!lang_c_here + !!lang_S_here;
 
   if (new_argc == argc)
     return;
 
   /* One more slot for a terminating null.  */
-  new_argv = (const char **) xmalloc ((new_argc + 1) * sizeof(char *));
+  new_argv = xmalloc ((new_argc + 1) * sizeof(char *));
 
   new_argv[0] = argv[0];
   j = 1;
@@ -209,9 +180,6 @@ lang_specific_driver (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)
@@ -233,7 +201,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
 }
 
 /* Called before linking.  Returns 0 on success and -1 on failure.  */
-int lang_specific_pre_link ()
+int lang_specific_pre_link (void)
 {
   return 0;  /* Not used for cpp.  */
 }