X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fcppspec.c;h=6ca1660845a5da27d8d23022924598b31ecd7fd0;hp=5f787d61c8dbbe8cfaa97a4b98c9386a78e6e048;hb=a9601c934b0aa967797b3d43d2b12f7639508fac;hpb=258d3911fa8cdf1bedf60e66226a1ad2122f440b diff --git a/gcc/cppspec.c b/gcc/cppspec.c index 5f787d61c8d..6ca1660845a 100644 --- a/gcc/cppspec.c +++ b/gcc/cppspec.c @@ -1,11 +1,11 @@ /* Specific flags and argument handling of the C preprocessor. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2007, 2010 Free Software Foundation, Inc. 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 @@ -14,13 +14,15 @@ 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 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 +. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "gcc.h" +#include "opts.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 @@ -29,36 +31,6 @@ 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 - /* Suffixes for known sorts of input files. Note that we do not list files which are normally considered to have been preprocessed already, since the user's expectation is that `cpp' always preprocesses. */ @@ -66,18 +38,18 @@ 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 the command line 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 (struct cl_decoded_option **in_decoded_options, + unsigned int *in_decoded_options_count, + int *in_added_libraries ATTRIBUTE_UNUSED) { - int argc = *in_argc; - const char *const *argv = *in_argv; + struct cl_decoded_option *decoded_options = *in_decoded_options; + unsigned int argc = *in_decoded_options_count; /* Do we need to read stdin? */ int read_stdin = 1; @@ -85,24 +57,21 @@ 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; - + /* Positions to insert -xc, -xassembler-with-cpp, and -o, if necessary. 0 means unnecessary. */ - int lang_c_here = 0; - int lang_S_here = 0; - int o_here = 0; + unsigned int lang_c_here = 0; + unsigned int lang_S_here = 0; + unsigned 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 = 0; - const char **new_argv; - int new_argc; + + unsigned int i, j; + struct cl_decoded_option *new_decoded_options; + unsigned int new_argc; extern int is_cpp_driver; is_cpp_driver = 1; @@ -112,126 +81,115 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) the output file. If we see a third input file, barf. */ for (i = 1; i < argc; i++) { - if (quote == 1) - { - quote = 0; - continue; - } - - if (argv[i][0] == '-') + switch (decoded_options[i].opt_index) { - if (argv[i][1] == '\0') - read_stdin = 0; - else if (argv[i][2] == '\0') - { - if (argv[i][1] == 'E') - need_E = 0; - else if (argv[i][1] == 'S' || argv[i][1] == 'c') - { - fatal ("\"%s\" is not a valid option to the preprocessor", - argv[i]); - return; - } - else if (argv[i][1] == 'x') - { - need_fixups = 0; - quote = 1; - } - else if (SWITCH_TAKES_ARG (argv[i][1])) - quote = 1; - } - 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; - } - else /* not an option */ - { - seen_input++; - if (seen_input == 3) - { - fatal ("too many input files"); - return; - } - else if (seen_input == 2) - { - o_here = i; - } - else - { + case OPT_E: + need_E = 0; + break; + + case OPT_S: + case OPT_c: + fatal_error ("%qs is not a valid option to the preprocessor", + decoded_options[i].orig_option_with_args_text); + return; + + case OPT_x: + need_fixups = 0; + break; + + case OPT_SPECIAL_input_file: + { + const char *file = decoded_options[i].arg; + + if (strcmp (file, "-") == 0) read_stdin = 0; - if (need_fixups) - { - int l = strlen (argv[i]); - int known = 0; - const char *const *suff; - - for (suff = known_suffixes; *suff; suff++) - if (!strcmp (*suff, &argv[i][l - strlen(*suff)])) + else + { + seen_input++; + if (seen_input == 3) + { + fatal_error ("too many input files"); + return; + } + else if (seen_input == 2) + { + o_here = i; + } + else + { + read_stdin = 0; + if (need_fixups) { - known = 1; - break; + int l = strlen (file); + int known = 0; + const char *const *suff; + + for (suff = known_suffixes; *suff; suff++) + if (!strcmp (*suff, &file[l - strlen(*suff)])) + { + known = 1; + break; + } + + if (! known) + { + /* .s files are a special case; we have to + treat them like .S files so + -D__ASSEMBLER__ will be in effect. */ + if (!strcmp (".s", &file[l - 2])) + lang_S_here = i; + else + lang_c_here = i; + } } - - if (! known) - { - /* .s files are a special case; we have to treat - them like .S files so -D__ASSEMBLER__ will be - in effect. */ - if (!strcmp (".s", &argv[i][l - 2])) - lang_S_here = i; - else - lang_c_here = i; - } - } - } + } + } + } + break; } } /* If we don't need to edit the command line, we can bail early. */ - new_argc = argc + need_E + need_no_gcc + read_stdin - + !!o_here + !!lang_c_here + !!lang_S_here; + new_argc = argc + need_E + read_stdin + !!lang_c_here + !!lang_S_here; - if (new_argc == argc) + if (new_argc == argc && !o_here) return; - /* One more slot for a terminating null. */ - new_argv = (const char **) xmalloc ((new_argc + 1) * sizeof(char *)); + new_decoded_options = XNEWVEC (struct cl_decoded_option, new_argc); - new_argv[0] = argv[0]; + new_decoded_options[0] = new_decoded_options[0]; j = 1; if (need_E) - new_argv[j++] = "-E"; - - if (need_no_gcc) - new_argv[j++] = "-no-gcc"; + generate_option (OPT_E, NULL, 1, CL_DRIVER, &new_decoded_options[j++]); for (i = 1; i < argc; i++, j++) { if (i == lang_c_here) - new_argv[j++] = "-xc"; + generate_option (OPT_x, "c", 1, CL_DRIVER, &new_decoded_options[j++]); else if (i == lang_S_here) - new_argv[j++] = "-xassembler-with-cpp"; + generate_option (OPT_x, "assembler-with-cpp", 1, CL_DRIVER, + &new_decoded_options[j++]); else if (i == o_here) - new_argv[j++] = "-o"; + { + generate_option (OPT_o, decoded_options[i].arg, 1, CL_DRIVER, + &new_decoded_options[j]); + continue; + } - new_argv[j] = argv[i]; + new_decoded_options[j] = decoded_options[i]; } if (read_stdin) - new_argv[j++] = "-"; + generate_option_input_file ("-", &new_decoded_options[j++]); - new_argv[j] = NULL; - *in_argc = new_argc; - *in_argv = new_argv; -} + *in_decoded_options_count = new_argc; + *in_decoded_options = new_decoded_options; +} /* 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. */ }