X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcppspec.c;h=344da17a37ed25085c7111a37882b6e5fd002a99;hb=d3e565451e7776f3c22fde8a66a622f4c79a5cab;hp=4ab043d21582b7cf8bf20dff51497047f2afafd4;hpb=81d1a796592acee836fefa7606cddd5b6a505ccd;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cppspec.c b/gcc/cppspec.c index 4ab043d2158..344da17a37e 100644 --- a/gcc/cppspec.c +++ b/gcc/cppspec.c @@ -1,58 +1,39 @@ /* Specific flags and argument handling of the C preprocessor. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2007 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 3, 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 COPYING3. If not see +. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.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. */ - -/* 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') + mentioned, it will read stdin. */ #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")) - #ifndef WORD_SWITCH_TAKES_ARG #define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR) #endif @@ -64,44 +45,42 @@ static const char *const known_suffixes[] = { ".c", ".C", ".S", ".m", ".cc", ".cxx", ".cpp", ".cp", ".c++", + ".sx", 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 *, ...)); - int *in_argc; - char ***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; - 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; - + /* 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; /* 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 @@ -113,7 +92,7 @@ lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries) quote = 0; continue; } - + if (argv[i][0] == '-') { if (argv[i][1] == '\0') @@ -124,8 +103,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') @@ -138,8 +117,6 @@ 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; } @@ -148,7 +125,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) @@ -188,13 +165,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 + 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; - new_argv = (char **) xmalloc (new_argc * sizeof(char *)); + /* One more slot for a terminating null. */ + new_argv = XNEWVEC (const char *, new_argc + 1); new_argv[0] = argv[0]; j = 1; @@ -202,9 +180,6 @@ 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) @@ -218,17 +193,18 @@ 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; -} +} -/* Called before linking. Returns 0 on success and -1 on failure. */ -int lang_specific_pre_link () +/* Called before linking. Returns 0 on success and -1 on failure. */ +int lang_specific_pre_link (void) { - 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. */