X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgcc.c;h=f3eecba06218b84da447c7dca859f7a5290156a9;hb=3fd378a3b2e8e8d2ea9645c6664b8d7d38110b8c;hp=e4cce369a9c087d1f72a8b890d36a936f96bf66a;hpb=eaeaf18f4303afc868e1aa4b9a335162d4ecaf07;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gcc.c b/gcc/gcc.c index e4cce369a9c..f3eecba0621 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -218,6 +218,10 @@ static const char *target_sysroot_hdrs_suffix = 0; static int save_temps_flag; +/* Nonzero means pass multiple source files to the compiler at one time. */ + +static int combine_flag = 0; + /* Nonzero means use pipes to communicate between subprocesses. Overridden by either of the above two flags. */ @@ -286,6 +290,7 @@ static struct rusage rus, prus; /* Forward declaration for prototypes. */ struct path_prefix; +struct prefix_list; static void init_spec (void); static void store_arg (const char *, int, int); @@ -298,9 +303,9 @@ static void putenv_from_prefixes (struct path_prefix *, const char *); static int access_check (const char *, int); static char *find_a_file (struct path_prefix *, const char *, int, int); static void add_prefix (struct path_prefix *, const char *, const char *, - int, int, int *, int); + int, int, int); static void add_sysrooted_prefix (struct path_prefix *, const char *, - const char *, int, int, int *, int); + const char *, int, int, int); static void translate_options (int *, const char *const **); static char *skip_whitespace (char *); static void delete_if_ordinary (const char *); @@ -319,6 +324,7 @@ static const char *eval_spec_function (const char *, const char *); static const char *handle_spec_function (const char *); static char *save_string (const char *, int); static void set_collect_gcc_options (void); +static void do_spec_path (struct prefix_list *, const char *, int, int, int, const char *, const char *); static int do_spec_1 (const char *, int, const char *); static int do_spec_2 (const char *); static void do_option_spec (const char *, const char *); @@ -340,7 +346,7 @@ static void display_help (void); static void add_preprocessor_option (const char *, int); static void add_assembler_option (const char *, int); static void add_linker_option (const char *, int); -static void process_command (int, const char *const *); +static void process_command (int, const char **); static int execute (void); static void alloc_args (void); static void clear_args (void); @@ -355,6 +361,7 @@ static const char *convert_filename (const char *, int, int); static const char *if_exists_spec_function (int, const char **); static const char *if_exists_else_spec_function (int, const char **); +static const char *replace_outfile_spec_function (int, const char **); /* The Specs Language @@ -595,6 +602,20 @@ proper position among the other output files. */ #define LIB_SPEC "%{!shared:%{g*:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}}" #endif +/* mudflap specs */ +#ifndef MFWRAP_SPEC +/* XXX: valid only for GNU ld */ +/* XXX: should exactly match hooks provided by libmudflap.a */ +#define MFWRAP_SPEC " %{static: %{fmudflap|fmudflapth: \ + --wrap=malloc --wrap=free --wrap=calloc --wrap=realloc\ + --wrap=mmap --wrap=munmap --wrap=alloca\ +} %{fmudflapth: --wrap=pthread_create --wrap=pthread_join --wrap=pthread_exit\ +}} %{fmudflap|fmudflapth: --wrap=main}" +#endif +#ifndef MFLIB_SPEC +#define MFLIB_SPEC "%{fmudflap|fmudflapth: -export-dynamic}" +#endif + /* config.h can define LIBGCC_SPEC to override how and when libgcc.a is included. */ #ifndef LIBGCC_SPEC @@ -679,7 +700,8 @@ proper position among the other output files. */ %{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ %(linker) %l " LINK_PIE_SPEC "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\ %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\ - %{static:} %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate:-lgcov}\ + %{static:} %{L*} %(mfwrap) %(link_libgcc) %o %(mflib)\ + %{fprofile-arcs|fprofile-generate:-lgcov}\ %{!nostdlib:%{!nodefaultlibs:%(link_gcc_c_sequence)}}\ %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}" #endif @@ -715,6 +737,8 @@ static const char *asm_spec = ASM_SPEC; static const char *asm_final_spec = ASM_FINAL_SPEC; static const char *link_spec = LINK_SPEC; static const char *lib_spec = LIB_SPEC; +static const char *mfwrap_spec = MFWRAP_SPEC; +static const char *mflib_spec = MFLIB_SPEC; static const char *libgcc_spec = LIBGCC_SPEC; static const char *endfile_spec = ENDFILE_SPEC; static const char *startfile_spec = STARTFILE_SPEC; @@ -743,12 +767,14 @@ static const char *trad_capable_cpp = file that happens to exist is up-to-date. */ static const char *cpp_unique_options = "%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}}\ - %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*} %{P} %I\ + %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*&F*} %{P} %I\ %{MD:-MD %{!o:%b.d}%{o*:%.d%*}}\ %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\ %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*}\ %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}}\ %{trigraphs} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i\ + %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\ + %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\ %{E|M|MM:%W{o*}}"; /* This contains cpp options which are common with cc1_options and are passed @@ -757,8 +783,9 @@ static const char *cpp_unique_options = options used to set target flags. Those special target flags settings may in turn cause preprocessor symbols to be defined specially. */ static const char *cpp_options = -"%(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*}\ - %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef}"; +"%(cpp_unique_options) %1 %{m*} %{std*&ansi} %{W*&pedantic*} %{w} %{f*}\ + %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef}\ + %{save-temps:-fpch-preprocess}"; /* This contains cpp options which are not passed when the preprocessor output will be used by another program. */ @@ -768,13 +795,14 @@ static const char *cpp_debug_options = "%{d*}"; static const char *cc1_options = "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\ %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\ - -auxbase%{c|S:%{o*:-strip %*}%{!o*: %b}}%{!c:%{!S: %b}}\ - %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\ + %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\ + %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi}\ %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\ %{Qn:-fno-ident} %{--help:--help}\ %{--target-help:--target-help}\ %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\ - %{fsyntax-only:-o %j} %{-param*}"; + %{fsyntax-only:-o %j} %{-param*}\ + %{fmudflap|fmudflapth:-fno-builtin -fno-merge-constants}"; static const char *asm_options = "%a %Y %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}"; @@ -861,6 +889,10 @@ struct compiler const char *cpp_spec; /* If non-NULL, substitute this spec for `%C', rather than the usual cpp_spec. */ + const int combinable; /* If nonzero, compiler can deal with + multiple source files at once (IMA). */ + const int needs_preprocessing; /* If nonzero, source files need to + be run through a preprocessor. */ }; /* Pointer to a vector of `struct compiler' that gives the spec for @@ -886,19 +918,26 @@ static const struct compiler default_compilers[] = were not present when we built the driver, we will hit these copies and be given a more meaningful error than "file not used since linking is not done". */ - {".m", "#Objective-C", 0}, {".mi", "#Objective-C", 0}, - {".cc", "#C++", 0}, {".cxx", "#C++", 0}, {".cpp", "#C++", 0}, - {".cp", "#C++", 0}, {".c++", "#C++", 0}, {".C", "#C++", 0}, - {".CPP", "#C++", 0}, {".ii", "#C++", 0}, - {".ads", "#Ada", 0}, {".adb", "#Ada", 0}, - {".f", "#Fortran", 0}, {".for", "#Fortran", 0}, {".fpp", "#Fortran", 0}, - {".F", "#Fortran", 0}, {".FOR", "#Fortran", 0}, {".FPP", "#Fortran", 0}, - {".r", "#Ratfor", 0}, - {".p", "#Pascal", 0}, {".pas", "#Pascal", 0}, - {".java", "#Java", 0}, {".class", "#Java", 0}, - {".zip", "#Java", 0}, {".jar", "#Java", 0}, + {".m", "#Objective-C", 0, 0, 0}, {".mi", "#Objective-C", 0, 0, 0}, + {".mm", "#Objective-C++", 0, 0, 0}, {".M", "#Objective-C++", 0, 0, 0}, + {".mii", "#Objective-C++", 0, 0, 0}, + {".cc", "#C++", 0, 0, 0}, {".cxx", "#C++", 0, 0, 0}, + {".cpp", "#C++", 0, 0, 0}, {".cp", "#C++", 0, 0, 0}, + {".c++", "#C++", 0, 0, 0}, {".C", "#C++", 0, 0, 0}, + {".CPP", "#C++", 0, 0, 0}, {".ii", "#C++", 0, 0, 0}, + {".ads", "#Ada", 0, 0, 0}, {".adb", "#Ada", 0, 0, 0}, + {".f", "#Fortran", 0, 0, 0}, {".for", "#Fortran", 0, 0, 0}, + {".F", "#Fortran", 0, 0, 0}, {".FOR", "#Fortran", 0, 0, 0}, + {".FPP", "#Fortran", 0, 0, 0}, + {".f90", "#Fortran 95", 0, 0, 0}, {".f95", "#Fortran 95", 0, 0, 0}, + {".fpp", "#Fortran", 0, 0, 0}, {".F", "#Fortran", 0, 0, 0}, + {".FOR", "#Fortran", 0, 0, 0}, {".FPP", "#Fortran", 0, 0, 0}, + {".r", "#Ratfor", 0, 0, 0}, + {".p", "#Pascal", 0, 0, 0}, {".pas", "#Pascal", 0, 0, 0}, + {".java", "#Java", 0, 0, 0}, {".class", "#Java", 0, 0, 0}, + {".zip", "#Java", 0, 0, 0}, {".jar", "#Java", 0, 0, 0}, /* Next come the entries for C. */ - {".c", "@c", 0}, + {".c", "@c", 0, 1, 1}, {"@c", /* cc1 has an integrated ISO C preprocessor. We should invoke the external preprocessor if -save-temps is given. */ @@ -906,17 +945,24 @@ static const struct compiler default_compilers[] = %{!E:%{!M:%{!MM:\ %{traditional|ftraditional:\ %eGNU C no longer supports -traditional without -E}\ + %{!combine:\ %{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \ %(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i} \n\ cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i} \ %(cc1_options)}\ %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\ cc1 %(cpp_unique_options) %(cc1_options)}}}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0}, + %{!fsyntax-only:%(invoke_as)}} \ + %{combine:\ + %{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \ + %(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i}}\ + %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\ + cc1 %(cpp_unique_options) %(cc1_options)}}\ + %{!fsyntax-only:%(invoke_as)}}}}}}", 0, 1, 1}, {"-", "%{!E:%e-E required when input is from standard input}\ - %(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)", 0}, - {".h", "@c-header", 0}, + %(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)", 0, 0, 0}, + {".h", "@c-header", 0, 0, 0}, {"@c-header", /* cc1 has an integrated ISO C preprocessor. We should invoke the external preprocessor if -save-temps is given. */ @@ -931,14 +977,14 @@ static const struct compiler default_compilers[] = %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\ cc1 %(cpp_unique_options) %(cc1_options)\ -o %g.s %{!o*:--output-pch=%i.gch}\ - %W{o*:--output-pch=%*}%V}}}}}}", 0}, - {".i", "@cpp-output", 0}, + %W{o*:--output-pch=%*}%V}}}}}}", 0, 0, 0}, + {".i", "@cpp-output", 0, 1, 0}, {"@cpp-output", - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0}, - {".s", "@assembler", 0}, + "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0}, + {".s", "@assembler", 0, 1, 0}, {"@assembler", - "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0}, - {".S", "@assembler-with-cpp", 0}, + "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0}, + {".S", "@assembler-with-cpp", 0, 1, 0}, {"@assembler-with-cpp", #ifdef AS_NEEDS_DASH_FOR_PIPED_INPUT "%(trad_capable_cpp) -lang-asm %(cpp_options)\ @@ -951,11 +997,11 @@ static const struct compiler default_compilers[] = %{!M:%{!MM:%{!E:%{!S:-o %|.s |\n\ as %(asm_debug) %(asm_options) %m.s %A }}}}" #endif - , 0}, + , 0, 1, 0}, #include "specs.h" /* Mark end of table. */ - {0, 0, 0} + {0, 0, 0, 0, 0} }; /* Number of elements in default_compilers, not counting the terminator. */ @@ -1009,6 +1055,7 @@ static const struct option_map option_map[] = {"--classpath", "-fclasspath=", "aj"}, {"--bootclasspath", "-fbootclasspath=", "aj"}, {"--CLASSPATH", "-fclasspath=", "aj"}, + {"--combine", "-combine", 0}, {"--comments", "-C", 0}, {"--comments-in-macros", "-CC", 0}, {"--compile", "-c", 0}, @@ -1017,8 +1064,10 @@ static const struct option_map option_map[] = {"--dependencies", "-M", 0}, {"--dump", "-d", "a"}, {"--dumpbase", "-dumpbase", "a"}, + {"--encoding", "-fencoding=", "aj"}, {"--entry", "-e", 0}, {"--extra-warnings", "-W", 0}, + {"--extdirs", "-fextdirs=", "aj"}, {"--for-assembler", "-Wa", "a"}, {"--for-linker", "-Xlinker", "a"}, {"--force-link", "-u", "a"}, @@ -1340,7 +1389,6 @@ struct prefix_list struct prefix_list *next; /* Next in linked list. */ int require_machine_suffix; /* Don't use without machine_suffix. */ /* 2 means try both machine_suffix and just_machine_suffix. */ - int *used_flag_ptr; /* 1 if a file was found with this prefix. */ int priority; /* Sort key - priority within list. */ int os_multilib; /* 1 if OS multilib scheme should be used, 0 for GCC multilib scheme. */ @@ -1385,6 +1433,13 @@ static const char *gcc_libexec_prefix; /* Default prefixes to attach to command names. */ +#ifndef STANDARD_STARTFILE_PREFIX_1 +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +#endif +#ifndef STANDARD_STARTFILE_PREFIX_2 +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +#endif + #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ #undef MD_EXEC_PREFIX #undef MD_STARTFILE_PREFIX @@ -1410,8 +1465,10 @@ static const char *md_exec_prefix = MD_EXEC_PREFIX; static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; -static const char *const standard_startfile_prefix_1 = "/lib/"; -static const char *const standard_startfile_prefix_2 = "/usr/lib/"; +static const char *const standard_startfile_prefix_1 + = STANDARD_STARTFILE_PREFIX_1; +static const char *const standard_startfile_prefix_2 + = STANDARD_STARTFILE_PREFIX_2; static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX; static const char *tooldir_prefix; @@ -1472,6 +1529,8 @@ static struct spec_list static_specs[] = INIT_STATIC_SPEC ("endfile", &endfile_spec), INIT_STATIC_SPEC ("link", &link_spec), INIT_STATIC_SPEC ("lib", &lib_spec), + INIT_STATIC_SPEC ("mfwrap", &mfwrap_spec), + INIT_STATIC_SPEC ("mflib", &mflib_spec), INIT_STATIC_SPEC ("libgcc", &libgcc_spec), INIT_STATIC_SPEC ("startfile", &startfile_spec), INIT_STATIC_SPEC ("switches_need_spaces", &switches_need_spaces), @@ -1516,6 +1575,7 @@ static const struct spec_function static_spec_functions[] = { { "if-exists", if_exists_spec_function }, { "if-exists-else", if_exists_else_spec_function }, + { "replace-outfile", replace_outfile_spec_function }, { 0, 0 } }; @@ -1525,6 +1585,11 @@ static int processing_spec_function; various permutations of -shared-libgcc, -shared, and such. */ #if defined(ENABLE_SHARED_LIBGCC) && !defined(REAL_LIBGCC_SPEC) + +#ifndef USE_LD_AS_NEEDED +#define USE_LD_AS_NEEDED 0 +#endif + static void init_gcc_specs (struct obstack *obstack, const char *shared_name, const char *static_name, const char *eh_name) @@ -1533,6 +1598,12 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name, buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name, "}%{!static:%{!static-libgcc:", +#if USE_LD_AS_NEEDED + "%{!shared-libgcc:", static_name, + " --as-needed ", shared_name, " --no-as-needed}" + "%{shared-libgcc:", shared_name, "%{!shared: ", static_name, + "}", +#else "%{!shared:%{!shared-libgcc:", static_name, " ", eh_name, "}%{shared-libgcc:", shared_name, " ", static_name, "}}%{shared:", @@ -1542,6 +1613,7 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name, #else shared_name, #endif +#endif "}}}", NULL); obstack_grow (obstack, buf, strlen (buf)); @@ -1635,6 +1707,9 @@ init_spec (void) #else "-lgcc_s%M" #endif +#ifdef USE_LIBUNWIND_EXCEPTIONS + " -lunwind" +#endif , "-lgcc", "-lgcc_eh" @@ -1771,6 +1846,11 @@ static int argbuf_length; static int argbuf_index; +/* Position in the argbuf array containing the name of the output file + (the value associated with the "-o" flag). */ + +static int have_o_argbuf_index = 0; + /* This is the list of suffixes and codes (%g/%u/%U/%j) and the associated temp file. If the HOST_BIT_BUCKET is used for %j, no entry is made for it here. */ @@ -1829,6 +1909,8 @@ store_arg (const char *arg, int delete_always, int delete_failure) argbuf[argbuf_index++] = arg; argbuf[argbuf_index] = 0; + if (strcmp (arg, "-o") == 0) + have_o_argbuf_index = argbuf_index; if (delete_always || delete_failure) record_temp_file (arg, delete_always, delete_failure); } @@ -2208,6 +2290,17 @@ record_temp_file (const char *filename, int always_delete, int fail_delete) /* Delete all the temporary files whose names we previously recorded. */ +#ifndef DELETE_IF_ORDINARY +#define DELETE_IF_ORDINARY(NAME,ST,VERBOSE_FLAG) \ +do \ + { \ + if (stat (NAME, &ST) >= 0 && S_ISREG (ST.st_mode)) \ + if (unlink (NAME) < 0) \ + if (VERBOSE_FLAG) \ + perror_with_name (NAME); \ + } while (0) +#endif + static void delete_if_ordinary (const char *name) { @@ -2224,10 +2317,7 @@ delete_if_ordinary (const char *name) if (i == 'y' || i == 'Y') #endif /* DEBUG */ - if (stat (name, &st) >= 0 && S_ISREG (st.st_mode)) - if (unlink (name) < 0) - if (verbose_flag) - perror_with_name (name); + DELETE_IF_ORDINARY (name, st, verbose_flag); } static void @@ -2420,11 +2510,7 @@ find_a_file (struct path_prefix *pprefix, const char *name, int mode, strcat (temp, multilib_name); strcat (temp, file_suffix); if (access_check (temp, mode) == 0) - { - if (pl->used_flag_ptr != 0) - *pl->used_flag_ptr = 1; - return temp; - } + return temp; } /* Now try just the multilib_name. */ @@ -2432,11 +2518,7 @@ find_a_file (struct path_prefix *pprefix, const char *name, int mode, strcat (temp, machine_suffix); strcat (temp, multilib_name); if (access_check (temp, mode) == 0) - { - if (pl->used_flag_ptr != 0) - *pl->used_flag_ptr = 1; - return temp; - } + return temp; } /* Certain prefixes are tried with just the machine type, @@ -2452,22 +2534,14 @@ find_a_file (struct path_prefix *pprefix, const char *name, int mode, strcat (temp, multilib_name); strcat (temp, file_suffix); if (access_check (temp, mode) == 0) - { - if (pl->used_flag_ptr != 0) - *pl->used_flag_ptr = 1; - return temp; - } + return temp; } strcpy (temp, pl->prefix); strcat (temp, just_machine_suffix); strcat (temp, multilib_name); if (access_check (temp, mode) == 0) - { - if (pl->used_flag_ptr != 0) - *pl->used_flag_ptr = 1; - return temp; - } + return temp; } /* Certain prefixes can't be used without the machine suffix @@ -2482,21 +2556,13 @@ find_a_file (struct path_prefix *pprefix, const char *name, int mode, strcat (temp, this_name); strcat (temp, file_suffix); if (access_check (temp, mode) == 0) - { - if (pl->used_flag_ptr != 0) - *pl->used_flag_ptr = 1; - return temp; - } + return temp; } strcpy (temp, pl->prefix); strcat (temp, this_name); if (access_check (temp, mode) == 0) - { - if (pl->used_flag_ptr != 0) - *pl->used_flag_ptr = 1; - return temp; - } + return temp; } } @@ -2530,7 +2596,7 @@ enum path_prefix_priority static void add_prefix (struct path_prefix *pprefix, const char *prefix, const char *component, /* enum prefix_priority */ int priority, - int require_machine_suffix, int *warn, int os_multilib) + int require_machine_suffix, int os_multilib) { struct prefix_list *pl, **prev; int len; @@ -2550,11 +2616,8 @@ add_prefix (struct path_prefix *pprefix, const char *prefix, pl = xmalloc (sizeof (struct prefix_list)); pl->prefix = prefix; pl->require_machine_suffix = require_machine_suffix; - pl->used_flag_ptr = warn; pl->priority = priority; pl->os_multilib = os_multilib; - if (warn) - *warn = 0; /* Insert after PREV. */ pl->next = (*prev); @@ -2566,10 +2629,10 @@ static void add_sysrooted_prefix (struct path_prefix *pprefix, const char *prefix, const char *component, /* enum prefix_priority */ int priority, - int require_machine_suffix, int *warn, int os_multilib) + int require_machine_suffix, int os_multilib) { if (!IS_ABSOLUTE_PATH (prefix)) - abort (); + fatal ("system path `%s' is not absolute", prefix); if (target_system_root) { @@ -2583,7 +2646,7 @@ add_sysrooted_prefix (struct path_prefix *pprefix, const char *prefix, } add_prefix (pprefix, prefix, component, priority, - require_machine_suffix, warn, os_multilib); + require_machine_suffix, os_multilib); } /* Execute the command specified by the arguments on the current line of spec. @@ -2607,8 +2670,7 @@ execute (void) struct command *commands; /* each command buffer with above info. */ - if (processing_spec_function) - abort (); + gcc_assert (!processing_spec_function); /* Count # of piped commands. */ for (n_commands = 1, i = 0; i < argbuf_index; i++) @@ -2781,8 +2843,7 @@ execute (void) int pid; pid = pwait (commands[i].pid, &status, 0); - if (pid < 0) - abort (); + gcc_assert (pid >= 0); #ifdef HAVE_GETRUSAGE if (report_times) @@ -2884,6 +2945,9 @@ struct infile { const char *name; const char *language; + struct compiler *incompiler; + bool compiled; + bool preprocessed; }; /* Also a vector of input files specified. */ @@ -2905,12 +2969,6 @@ static int added_libraries; /* And a vector of corresponding output files is made up later. */ const char **outfiles; - -/* Used to track if none of the -B paths are used. */ -static int warn_B; - -/* Gives value to pass as "warn" to add_prefix for standard prefixes. */ -static int *warn_std_ptr = 0; #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) @@ -2998,6 +3056,7 @@ display_help (void) fputs (_(" -Xassembler Pass on to the assembler\n"), stdout); fputs (_(" -Xpreprocessor Pass on to the preprocessor\n"), stdout); fputs (_(" -Xlinker Pass on to the linker\n"), stdout); + fputs (_(" -combine Pass multiple source files to compiler at once\n"), stdout); fputs (_(" -save-temps Do not delete intermediate files\n"), stdout); fputs (_(" -pipe Use pipes rather than intermediate files\n"), stdout); fputs (_(" -time Time the execution of each subprocess\n"), stdout); @@ -3076,7 +3135,7 @@ add_linker_option (const char *option, int len) Store its length in `n_switches'. */ static void -process_command (int argc, const char *const *argv) +process_command (int argc, const char **argv) { int i; const char *temp; @@ -3084,7 +3143,6 @@ process_command (int argc, const char *const *argv) const char *spec_lang = 0; int last_language_n_infiles; int have_c = 0; - int have_o = 0; int lang_n_infiles = 0; #ifdef MODIFY_TARGET_NAME int is_modify_target_name; @@ -3205,9 +3263,9 @@ process_command (int argc, const char *const *argv) set_std_prefix (gcc_exec_prefix, len); add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 0, NULL, 0); + PREFIX_PRIORITY_LAST, 0, 0); add_prefix (&startfile_prefixes, gcc_exec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 0, NULL, 0); + PREFIX_PRIORITY_LAST, 0, 0); } /* COMPILER_PATH and LIBRARY_PATH have values @@ -3235,10 +3293,9 @@ process_command (int argc, const char *const *argv) else nstore[endp - startp] = 0; add_prefix (&exec_prefixes, nstore, 0, - PREFIX_PRIORITY_LAST, 0, NULL, 0); - add_prefix (&include_prefixes, - concat (nstore, "include", NULL), - 0, PREFIX_PRIORITY_LAST, 0, NULL, 0); + PREFIX_PRIORITY_LAST, 0, 0); + add_prefix (&include_prefixes, nstore, 0, + PREFIX_PRIORITY_LAST, 0, 0); if (*endp == 0) break; endp = startp = endp + 1; @@ -3270,7 +3327,7 @@ process_command (int argc, const char *const *argv) else nstore[endp - startp] = 0; add_prefix (&startfile_prefixes, nstore, NULL, - PREFIX_PRIORITY_LAST, 0, NULL, 1); + PREFIX_PRIORITY_LAST, 0, 1); if (*endp == 0) break; endp = startp = endp + 1; @@ -3303,7 +3360,7 @@ process_command (int argc, const char *const *argv) else nstore[endp - startp] = 0; add_prefix (&startfile_prefixes, nstore, NULL, - PREFIX_PRIORITY_LAST, 0, NULL, 1); + PREFIX_PRIORITY_LAST, 0, 1); if (*endp == 0) break; endp = startp = endp + 1; @@ -3314,10 +3371,10 @@ process_command (int argc, const char *const *argv) } /* Convert new-style -- options to old-style. */ - translate_options (&argc, &argv); + translate_options (&argc, (const char *const **) &argv); /* Do language-specific adjustment/addition of flags. */ - lang_specific_driver (&argc, &argv, &added_libraries); + lang_specific_driver (&argc, (const char *const **) &argv, &added_libraries); /* Scan argv twice. Here, the first time, just count how many switches there will be in their vector, and how many input files in theirs. @@ -3486,6 +3543,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" save_temps_flag = 1; n_switches++; } + else if (strcmp (argv[i], "-combine") == 0) + { + combine_flag = 1; + n_switches++; + } else if (strcmp (argv[i], "-specs") == 0) { struct user_specs *user = xmalloc (sizeof (struct user_specs)); @@ -3585,25 +3647,24 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" && (IS_DIR_SEPARATOR (value[len - 1]))) { if (len == 7) - add_prefix (&include_prefixes, "include", NULL, - PREFIX_PRIORITY_B_OPT, 0, NULL, 0); + add_prefix (&include_prefixes, "./", NULL, + PREFIX_PRIORITY_B_OPT, 0, 0); else { - char * string = xmalloc (len + 1); - - strncpy (string, value, len - 7); - strcpy (string + len - 7, "include"); - add_prefix (&include_prefixes, string, NULL, - PREFIX_PRIORITY_B_OPT, 0, NULL, 0); + char *string = xmalloc (len - 6); + memcpy (string, value, len - 7); + string[len - 7] = 0; + add_prefix (&include_prefixes, string, NULL, + PREFIX_PRIORITY_B_OPT, 0, 0); } } add_prefix (&exec_prefixes, value, NULL, - PREFIX_PRIORITY_B_OPT, 0, &warn_B, 0); + PREFIX_PRIORITY_B_OPT, 0, 0); add_prefix (&startfile_prefixes, value, NULL, - PREFIX_PRIORITY_B_OPT, 0, &warn_B, 0); - add_prefix (&include_prefixes, concat (value, "include", NULL), - NULL, PREFIX_PRIORITY_B_OPT, 0, NULL, 0); + PREFIX_PRIORITY_B_OPT, 0, 0); + add_prefix (&include_prefixes, value, NULL, + PREFIX_PRIORITY_B_OPT, 0, 0); n_switches++; } break; @@ -3628,7 +3689,6 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" goto normal_switch; case 'o': - have_o = 1; #if defined(HAVE_TARGET_EXECUTABLE_SUFFIX) if (! have_c) { @@ -3721,8 +3781,6 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" } } - combine_inputs = (have_c && have_o && lang_n_infiles > 1); - if ((save_temps_flag || report_times) && use_pipes) { /* -save-temps overrides -pipe, so that temp files are produced */ @@ -3744,21 +3802,21 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" as well as trying the machine and the version. */ #ifndef OS2 add_prefix (&exec_prefixes, standard_libexec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 1, 0); add_prefix (&exec_prefixes, standard_libexec_prefix, "BINUTILS", - PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 2, 0); add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS", - PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 2, 0); add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS", - PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 2, 0); add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS", - PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 2, 0); #endif add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS", - PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 1, 0); add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS", - PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 1, 0); tooldir_prefix = concat (tooldir_base_prefix, spec_machine, dir_separator_str, NULL); @@ -3781,11 +3839,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" add_prefix (&exec_prefixes, concat (gcc_exec_tooldir_prefix, "bin", dir_separator_str, NULL), - NULL, PREFIX_PRIORITY_LAST, 0, NULL, 0); + NULL, PREFIX_PRIORITY_LAST, 0, 0); add_prefix (&startfile_prefixes, concat (gcc_exec_tooldir_prefix, "lib", dir_separator_str, NULL), - NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); + NULL, PREFIX_PRIORITY_LAST, 0, 1); } tooldir_prefix = concat (standard_exec_prefix, spec_machine, @@ -3795,10 +3853,10 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" add_prefix (&exec_prefixes, concat (tooldir_prefix, "bin", dir_separator_str, NULL), - "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 0); + "BINUTILS", PREFIX_PRIORITY_LAST, 0, 0); add_prefix (&startfile_prefixes, concat (tooldir_prefix, "lib", dir_separator_str, NULL), - "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); + "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1); #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS) /* If the normal TARGET_SYSTEM_ROOT is inside of $exec_prefix, @@ -4142,7 +4200,9 @@ static int basename_length; static int suffixed_basename_length; static const char *input_basename; static const char *input_suffix; +#ifndef HOST_LACKS_INODE_NUMBERS static struct stat input_stat; +#endif static int input_stat_set; /* The compiler used to process the current input file. */ @@ -4307,7 +4367,7 @@ do_self_spec (const char *spec) /* Each switch should start with '-'. */ if (argbuf[i][0] != '-') - abort (); + fatal ("switch '%s' does not start with '-'", argbuf[i]); sw = &switches[i + first]; sw->part1 = &argbuf[i][1]; @@ -4319,6 +4379,107 @@ do_self_spec (const char *spec) } } +void +do_spec_path (struct prefix_list *pl, const char *option, + int omit_if_relative, int separate_options, + int only_subdir, + const char *dir_for_machine_suffix, + const char *dir_for_no_suffix) +{ + static size_t bufsize = 0; + static char *buffer; + int idx; + + /* Used on systems which record the specified -L dirs + and use them to search for dynamic linking. */ + /* Relative directories always come from -B, + and it is better not to use them for searching + at run time. In particular, stage1 loses. */ + if (omit_if_relative + && !IS_ABSOLUTE_PATH (pl->prefix)) + return; + + /* Try subdirectory if there is one. */ + if (machine_suffix && dir_for_machine_suffix) + { + if (strlen (pl->prefix) + strlen (machine_suffix) + >= bufsize) + bufsize = (strlen (pl->prefix) + + strlen (machine_suffix)) * 2 + 1; + buffer = xrealloc (buffer, bufsize); + strcpy (buffer, pl->prefix); + strcat (buffer, machine_suffix); + if (is_directory (buffer, dir_for_machine_suffix, 1)) + { + do_spec_1 (option, separate_options, NULL); + if (separate_options) + do_spec_1 (" ", 0, NULL); + do_spec_1 (buffer, 1, NULL); + do_spec_1 (dir_for_machine_suffix, 1, NULL); + /* Make this a separate argument. */ + do_spec_1 (" ", 0, NULL); + } + } + if (!pl->require_machine_suffix && dir_for_no_suffix) + { + if (is_directory (pl->prefix, dir_for_no_suffix, 1)) + { + do_spec_1 (option, separate_options, NULL); + if (separate_options) + do_spec_1 (" ", 0, NULL); + do_spec_1 (pl->prefix, 1, NULL); + do_spec_1 (dir_for_no_suffix, 1, NULL); + /* Make this a separate argument. */ + do_spec_1 (" ", 0, NULL); + } + } + + if (only_subdir) + return; + + if (machine_suffix) + { + if (is_directory (pl->prefix, machine_suffix, 1)) + { + do_spec_1 (option, separate_options, NULL); + if (separate_options) + do_spec_1 (" ", 0, NULL); + do_spec_1 (pl->prefix, 1, NULL); + /* Remove slash from machine_suffix. */ + if (strlen (machine_suffix) >= bufsize) + bufsize = strlen (machine_suffix) * 2 + 1; + buffer = xrealloc (buffer, bufsize); + strcpy (buffer, machine_suffix); + idx = strlen (buffer); + if (IS_DIR_SEPARATOR (buffer[idx - 1])) + buffer[idx - 1] = 0; + do_spec_1 (buffer, 1, NULL); + /* Make this a separate argument. */ + do_spec_1 (" ", 0, NULL); + } + } + if (!pl->require_machine_suffix) + { + if (is_directory (pl->prefix, "", 1)) + { + do_spec_1 (option, separate_options, NULL); + if (separate_options) + do_spec_1 (" ", 0, NULL); + /* Remove slash from pl->prefix. */ + if (strlen (pl->prefix) >= bufsize) + bufsize = strlen (pl->prefix) * 2 + 1; + buffer = xrealloc (buffer, bufsize); + strcpy (buffer, pl->prefix); + idx = strlen (buffer); + if (IS_DIR_SEPARATOR (buffer[idx - 1])) + buffer[idx - 1] = 0; + do_spec_1 (buffer, 1, NULL); + /* Make this a separate argument. */ + do_spec_1 (" ", 0, NULL); + } + } +} + /* Process the sub-spec SPEC as a portion of a larger spec. This is like processing a whole spec except that we do not initialize at the beginning and we do not supply a @@ -4433,7 +4594,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) switch (c = *p++) { case 0: - fatal ("invalid specification! Bug in cc"); + fatal ("spec '%s' invalid", spec); case 'b': obstack_grow (&obstack, input_basename, basename_length); @@ -4455,110 +4616,22 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) case 'D': { struct prefix_list *pl = startfile_prefixes.plist; - size_t bufsize = 100; - char *buffer = xmalloc (bufsize); - int idx; for (; pl; pl = pl->next) { -#ifdef RELATIVE_PREFIX_NOT_LINKDIR - /* Used on systems which record the specified -L dirs - and use them to search for dynamic linking. */ - /* Relative directories always come from -B, - and it is better not to use them for searching - at run time. In particular, stage1 loses. */ - if (!IS_ABSOLUTE_PATH (pl->prefix)) - continue; -#endif - /* Try subdirectory if there is one. */ - if (multilib_dir != NULL - || (pl->os_multilib && multilib_os_dir != NULL)) - { - const char *multi_dir; + const char *no_suffix_multilib_dir; - multi_dir = pl->os_multilib ? multilib_os_dir - : multilib_dir; - if (machine_suffix && multilib_dir) - { - if (strlen (pl->prefix) + strlen (machine_suffix) - >= bufsize) - bufsize = (strlen (pl->prefix) - + strlen (machine_suffix)) * 2 + 1; - buffer = xrealloc (buffer, bufsize); - strcpy (buffer, pl->prefix); - strcat (buffer, machine_suffix); - if (is_directory (buffer, multilib_dir, 1)) - { - do_spec_1 ("-L", 0, NULL); -#ifdef SPACE_AFTER_L_OPTION - do_spec_1 (" ", 0, NULL); -#endif - do_spec_1 (buffer, 1, NULL); - do_spec_1 (multilib_dir, 1, NULL); - /* Make this a separate argument. */ - do_spec_1 (" ", 0, NULL); - } - } - if (!pl->require_machine_suffix) - { - if (is_directory (pl->prefix, multi_dir, 1)) - { - do_spec_1 ("-L", 0, NULL); -#ifdef SPACE_AFTER_L_OPTION - do_spec_1 (" ", 0, NULL); -#endif - do_spec_1 (pl->prefix, 1, NULL); - do_spec_1 (multi_dir, 1, NULL); - /* Make this a separate argument. */ - do_spec_1 (" ", 0, NULL); - } - } - } - if (machine_suffix) - { - if (is_directory (pl->prefix, machine_suffix, 1)) - { - do_spec_1 ("-L", 0, NULL); -#ifdef SPACE_AFTER_L_OPTION - do_spec_1 (" ", 0, NULL); -#endif - do_spec_1 (pl->prefix, 1, NULL); - /* Remove slash from machine_suffix. */ - if (strlen (machine_suffix) >= bufsize) - bufsize = strlen (machine_suffix) * 2 + 1; - buffer = xrealloc (buffer, bufsize); - strcpy (buffer, machine_suffix); - idx = strlen (buffer); - if (IS_DIR_SEPARATOR (buffer[idx - 1])) - buffer[idx - 1] = 0; - do_spec_1 (buffer, 1, NULL); - /* Make this a separate argument. */ - do_spec_1 (" ", 0, NULL); - } - } - if (!pl->require_machine_suffix) - { - if (is_directory (pl->prefix, "", 1)) - { - do_spec_1 ("-L", 0, NULL); -#ifdef SPACE_AFTER_L_OPTION - do_spec_1 (" ", 0, NULL); + no_suffix_multilib_dir = pl->os_multilib ? multilib_os_dir + : multilib_dir; + /* Do not separate options, include non-multilibbed variant. */ + do_spec_path (pl, "-L", +#ifdef RELATIVE_PREFIX_NOT_LINKDIR + 1, +#else + 0, #endif - /* Remove slash from pl->prefix. */ - if (strlen (pl->prefix) >= bufsize) - bufsize = strlen (pl->prefix) * 2 + 1; - buffer = xrealloc (buffer, bufsize); - strcpy (buffer, pl->prefix); - idx = strlen (buffer); - if (IS_DIR_SEPARATOR (buffer[idx - 1])) - buffer[idx - 1] = 0; - do_spec_1 (buffer, 1, NULL); - /* Make this a separate argument. */ - do_spec_1 (" ", 0, NULL); - } - } + 0, 0, multilib_dir, no_suffix_multilib_dir); } - free (buffer); } break; @@ -4660,7 +4733,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) p += 2; /* We don't support extra suffix characters after %O. */ if (*p == '.' || ISALPHA ((unsigned char) *p)) - abort (); + fatal ("spec '%s' has invalid `%%0%c'", spec, *p); if (suffix_length == 0) suffix = TARGET_OBJECT_SUFFIX; else @@ -4693,6 +4766,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) *((char *) temp_filename + temp_filename_length) = '\0'; if (strcmp (temp_filename, input_filename) != 0) { +#ifndef HOST_LACKS_INODE_NUMBERS struct stat st_temp; /* Note, set_input() resets input_stat_set to 0. */ @@ -4707,11 +4781,19 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) and we can do the stat for the temp_filename then the they could still refer to the same file if st_dev/st_ino's are the same. */ - if (input_stat_set != 1 || stat (temp_filename, &st_temp) < 0 || input_stat.st_dev != st_temp.st_dev || input_stat.st_ino != st_temp.st_ino) +#else + /* Just compare canonical pathnames. */ + char* input_realname = lrealpath (input_filename); + char* temp_realname = lrealpath (temp_filename); + bool files_differ = strcmp (input_realname, temp_realname); + free (input_realname); + free (temp_realname); + if (files_differ) +#endif { temp_filename = save_string (temp_filename, temp_filename_length + 1); @@ -4770,7 +4852,12 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) if (combine_inputs) { for (i = 0; (int) i < n_infiles; i++) - store_arg (infiles[i].name, 0, 0); + if ((!infiles[i].language) || (infiles[i].language[0] != '*')) + if (infiles[i].incompiler == input_file_compiler) + { + store_arg (infiles[i].name, 0, 0); + infiles[i].compiled = true; + } } else { @@ -4805,13 +4892,8 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) } for (; pl; pl = pl->next) - { - do_spec_1 ("-isystem", 1, NULL); - /* Make this a separate argument. */ - do_spec_1 (" ", 0, NULL); - do_spec_1 (pl->prefix, 1, NULL); - do_spec_1 (" ", 0, NULL); - } + /* Separate options, don't include non-suffixed variant. */ + do_spec_path (pl, "-isystem", 0, 1, 1, "include", "include"); } break; @@ -4848,7 +4930,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) int cur_index = argbuf_index; /* Handle the {...} following the %W. */ if (*p != '{') - abort (); + fatal ("spec `%s' has invalid `%%W%c", spec, *p); p = handle_braces (p + 1); if (p == 0) return -1; @@ -4879,7 +4961,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) /* Skip past the option value and make a copy. */ if (*p != '{') - abort (); + fatal ("spec `%s' has invalid `%%x%c'", spec, *p); while (*p++ != '}') ; string = save_string (p1 + 1, p - p1 - 2); @@ -5089,7 +5171,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) } else /* Catch the case where a spec string contains something like - '%{foo:%*}'. ie there is no * in the pattern on the left + '%{foo:%*}'. i.e. there is no * in the pattern on the left hand side of the :. */ error ("spec failure: '%%*' has not been initialized by pattern match"); break; @@ -5437,6 +5519,7 @@ handle_braces (const char *p) { const char *atom, *end_atom; const char *d_atom = NULL, *d_end_atom = NULL; + const char *orig = p; bool a_is_suffix; bool a_is_starred; @@ -5456,7 +5539,7 @@ handle_braces (const char *p) do { if (a_must_be_last) - abort (); + goto invalid; /* Scan one "atom" (S in the description above of %{}, possibly with !, ., or * modifiers). */ @@ -5480,32 +5563,33 @@ handle_braces (const char *p) p++, a_is_starred = 1; SKIP_WHITE(); - if (*p == '&' || *p == '}') + switch (*p) { + case '&': case '}': /* Substitute the switch(es) indicated by the current atom. */ ordered_set = true; if (disjunct_set || n_way_choice || a_is_negated || a_is_suffix || atom == end_atom) - abort (); + goto invalid; mark_matching_switches (atom, end_atom, a_is_starred); if (*p == '}') process_marked_switches (); - } - else if (*p == '|' || *p == ':') - { + break; + + case '|': case ':': /* Substitute some text if the current atom appears as a switch or suffix. */ disjunct_set = true; if (ordered_set) - abort (); + goto invalid; if (atom == end_atom) { if (!n_way_choice || disj_matched || *p == '|' || a_is_negated || a_is_suffix || a_is_starred) - abort (); + goto invalid; /* An empty term may appear as the last choice of an N-way choice set; it means "otherwise". */ @@ -5516,7 +5600,7 @@ handle_braces (const char *p) else { if (a_is_suffix && a_is_starred) - abort (); + goto invalid; if (!a_is_starred) disj_starred = false; @@ -5559,14 +5643,19 @@ handle_braces (const char *p) d_atom = d_end_atom = NULL; } } + break; + + default: + goto invalid; } - else - abort (); } while (*p++ != '}'); return p; - + + invalid: + fatal ("braced spec `%s' is invalid at `%c'", orig, *p); + #undef SKIP_WHITE } @@ -5606,7 +5695,7 @@ process_brace_body (const char *p, const char *atom, const char *end_atom, else if (*p == '%' && p[1] == '*' && nesting_level == 1) have_subst = true; else if (*p == '\0') - abort (); + goto invalid; p++; } @@ -5615,7 +5704,7 @@ process_brace_body (const char *p, const char *atom, const char *end_atom, end_body--; if (have_subst && !starred) - abort (); + goto invalid; if (matched) { @@ -5651,6 +5740,9 @@ process_brace_body (const char *p, const char *atom, const char *end_atom, } return p; + + invalid: + fatal ("braced spec body `%s' is invalid", body); } /* Return 0 iff switch number SWITCHNUM is obsoleted by a later switch @@ -5904,14 +5996,15 @@ fatal_error (int signum) kill (getpid (), signum); } -extern int main (int, const char *const *); +extern int main (int, const char **); int -main (int argc, const char *const *argv) +main (int argc, const char **argv) { size_t i; int value; int linker_was_run = 0; + int lang_n_infiles = 0; int num_linker_inputs = 0; char *explicit_link_files; char *specs_file; @@ -6066,7 +6159,7 @@ main (int argc, const char *const *argv) if (*md_exec_prefix) { add_prefix (&exec_prefixes, md_exec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 0, NULL, 0); + PREFIX_PRIORITY_LAST, 0, 0); } } @@ -6098,7 +6191,7 @@ main (int argc, const char *const *argv) int ndx; for (ndx = 0; ndx < argbuf_index; ndx++) add_sysrooted_prefix (&startfile_prefixes, argbuf[ndx], "BINUTILS", - PREFIX_PRIORITY_LAST, 0, NULL, 1); + PREFIX_PRIORITY_LAST, 0, 1); } /* We should eventually get rid of all these and stick to startfile_prefix_spec exclusively. */ @@ -6106,15 +6199,15 @@ main (int argc, const char *const *argv) { if (*md_exec_prefix) add_sysrooted_prefix (&startfile_prefixes, md_exec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 0, NULL, 1); + PREFIX_PRIORITY_LAST, 0, 1); if (*md_startfile_prefix) add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix, - "GCC", PREFIX_PRIORITY_LAST, 0, NULL, 1); + "GCC", PREFIX_PRIORITY_LAST, 0, 1); if (*md_startfile_prefix_1) add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix_1, - "GCC", PREFIX_PRIORITY_LAST, 0, NULL, 1); + "GCC", PREFIX_PRIORITY_LAST, 0, 1); /* If standard_startfile_prefix is relative, base it on standard_exec_prefix. This lets us move the installed tree @@ -6126,29 +6219,29 @@ main (int argc, const char *const *argv) if (IS_ABSOLUTE_PATH (standard_startfile_prefix)) add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix, "BINUTILS", - PREFIX_PRIORITY_LAST, 0, NULL, 1); + PREFIX_PRIORITY_LAST, 0, 1); else if (*cross_compile == '0') { if (gcc_exec_prefix) add_prefix (&startfile_prefixes, concat (gcc_exec_prefix, machine_suffix, standard_startfile_prefix, NULL), - NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); + NULL, PREFIX_PRIORITY_LAST, 0, 1); add_prefix (&startfile_prefixes, concat (standard_exec_prefix, machine_suffix, standard_startfile_prefix, NULL), - NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); + NULL, PREFIX_PRIORITY_LAST, 0, 1); } - add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1, - "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); - add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2, - "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); -#if 0 /* Can cause surprises, and one can use -B./ instead. */ - add_prefix (&startfile_prefixes, "./", NULL, - PREFIX_PRIORITY_LAST, 1, NULL, 0); -#endif + if (*standard_startfile_prefix_1) + add_sysrooted_prefix (&startfile_prefixes, + standard_startfile_prefix_1, "BINUTILS", + PREFIX_PRIORITY_LAST, 0, 1); + if (*standard_startfile_prefix_2) + add_sysrooted_prefix (&startfile_prefixes, + standard_startfile_prefix_2, "BINUTILS", + PREFIX_PRIORITY_LAST, 0, 1); } /* Process any user specified specs in the order given on the command @@ -6307,28 +6400,97 @@ main (int argc, const char *const *argv) explicit_link_files = xcalloc (1, n_infiles); - if (combine_inputs) + if (combine_flag) + combine_inputs = true; + else + combine_inputs = false; + + for (i = 0; (int) i < n_infiles; i++) { - int lang_n_infiles = 0; - for (i = 0; (int) i < n_infiles; i++) - { - const char *name = infiles[i].name; - struct compiler *compiler - = lookup_compiler (name, strlen (name), infiles[i].language); - if (compiler == NULL) - error ("%s: linker input file unused because linking not done", - name); - else if (lang_n_infiles > 0 && compiler != input_file_compiler) - fatal ("cannot specify -o with -c or -S and multiple languages"); - else - { - lang_n_infiles++; - input_file_compiler = compiler; - } - } + const char *name = infiles[i].name; + struct compiler *compiler = lookup_compiler (name, + strlen (name), + infiles[i].language); + + if (compiler && !(compiler->combinable)) + combine_inputs = false; + + if (lang_n_infiles > 0 && compiler != input_file_compiler + && infiles[i].language && infiles[i].language[0] != '*') + infiles[i].incompiler = compiler; + else if (compiler) + { + lang_n_infiles++; + input_file_compiler = compiler; + infiles[i].incompiler = compiler; + } + else + { + /* Since there is no compiler for this input file, assume it is a + linker file. */ + explicit_link_files[i] = 1; + infiles[i].incompiler = NULL; + } + infiles[i].compiled = false; + infiles[i].preprocessed = false; } - for (i = 0; (int) i < (combine_inputs ? 1 : n_infiles); i++) + if (combine_flag && save_temps_flag) + { + bool save_combine_inputs = combine_inputs; + /* Must do a separate pre-processing pass for C & Objective-C files, to + obtain individual .i files. */ + + combine_inputs = false; + for (i = 0; (int) i < n_infiles; i++) + { + int this_file_error = 0; + + input_file_number = i; + set_input (infiles[i].name); + if (infiles[i].incompiler + && (infiles[i].incompiler)->needs_preprocessing) + input_file_compiler = infiles[i].incompiler; + else + continue; + + if (input_file_compiler) + { + if (input_file_compiler->spec[0] == '#') + { + error ("%s: %s compiler not installed on this system", + input_filename, &input_file_compiler->spec[1]); + this_file_error = 1; + } + else + { + value = do_spec (input_file_compiler->spec); + infiles[i].preprocessed = true; + if (!have_o_argbuf_index) + fatal ("spec `%s' is invalid", input_file_compiler->spec); + infiles[i].name = argbuf[have_o_argbuf_index]; + infiles[i].incompiler + = lookup_compiler (infiles[i].name, + strlen (infiles[i].name), + infiles[i].language); + + if (value < 0) + this_file_error = 1; + } + } + + if (this_file_error) + { + delete_failure_queue (); + error_count++; + break; + } + clear_failure_queue (); + } + combine_inputs = save_combine_inputs; + } + + for (i = 0; (int) i < n_infiles; i++) { int this_file_error = 0; @@ -6337,6 +6499,9 @@ main (int argc, const char *const *argv) input_file_number = i; set_input (infiles[i].name); + if (infiles[i].compiled) + continue; + /* Use the same thing in %o, unless cp->spec says otherwise. */ outfiles[i] = input_filename; @@ -6347,6 +6512,8 @@ main (int argc, const char *const *argv) input_file_compiler = lookup_compiler (infiles[i].name, input_filename_length, infiles[i].language); + else + input_file_compiler = infiles[i].incompiler; if (input_file_compiler) { @@ -6361,6 +6528,7 @@ main (int argc, const char *const *argv) else { value = do_spec (input_file_compiler->spec); + infiles[i].compiled = true; if (value < 0) this_file_error = 1; } @@ -6379,6 +6547,7 @@ main (int argc, const char *const *argv) { delete_failure_queue (); error_count++; + break; } /* If this compilation succeeded, don't delete those files later. */ clear_failure_queue (); @@ -6493,7 +6662,7 @@ lookup_compiler (const char *name, size_t length, const char *language) } #if defined (OS2) ||defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* look again, but case-insensitively this time. */ + /* Look again, but case-insensitively this time. */ if (cp < compilers) for (cp = compilers + n_compilers - 1; cp >= compilers; cp--) { @@ -6570,9 +6739,9 @@ pfatal_pexecute (const char *errmsg_fmt, const char *errmsg_arg) /* Output an error message and exit. */ void -fancy_abort (void) +fancy_abort (const char *file, int line, const char *func) { - fatal ("internal gcc abort"); + fatal ("internal gcc abort in %s, at %s:%d", func, file, line); } /* Output an error message and exit. */ @@ -6764,7 +6933,10 @@ used_arg (const char *p, int len) while (*q != ' ') { if (*q == '\0') - abort (); + { + invalid_matches: + fatal ("multilib spec `%s' is invalid", multilib_matches); + } q++; } matches[i].len = q - matches[i].str; @@ -6773,7 +6945,7 @@ used_arg (const char *p, int len) while (*q != ';' && *q != '\0') { if (*q == ' ') - abort (); + goto invalid_matches; q++; } matches[i].rep_len = q - matches[i].replace; @@ -6790,20 +6962,21 @@ used_arg (const char *p, int len) = xmalloc (sizeof (struct mswitchstr) * (n_mdswitches + (n_switches ? n_switches : 1))); for (i = 0; i < n_switches; i++) - { - int xlen = strlen (switches[i].part1); - for (j = 0; j < cnt; j++) - if (xlen == matches[j].len - && ! strncmp (switches[i].part1, matches[j].str, xlen)) - { - mswitches[n_mswitches].str = matches[j].replace; - mswitches[n_mswitches].len = matches[j].rep_len; - mswitches[n_mswitches].replace = (char *) 0; - mswitches[n_mswitches].rep_len = 0; - n_mswitches++; - break; - } - } + if (switches[i].live_cond != SWITCH_IGNORE) + { + int xlen = strlen (switches[i].part1); + for (j = 0; j < cnt; j++) + if (xlen == matches[j].len + && ! strncmp (switches[i].part1, matches[j].str, xlen)) + { + mswitches[n_mswitches].str = matches[j].replace; + mswitches[n_mswitches].len = matches[j].rep_len; + mswitches[n_mswitches].replace = (char *) 0; + mswitches[n_mswitches].rep_len = 0; + n_mswitches++; + break; + } + } /* Add MULTILIB_DEFAULTS switches too, as long as they were not present on the command line nor any options mutually incompatible with @@ -6952,7 +7125,11 @@ set_multilib_dir (void) while (*p != ';') { if (*p == '\0') - abort (); + { + invalid_exclusions: + fatal ("multilib exclusions `%s' is invalid", + multilib_exclusions); + } if (! ok) { @@ -6964,7 +7141,7 @@ set_multilib_dir (void) while (*p != ' ' && *p != ';') { if (*p == '\0') - abort (); + goto invalid_exclusions; ++p; } @@ -7006,7 +7183,11 @@ set_multilib_dir (void) while (*p != ' ') { if (*p == '\0') - abort (); + { + invalid_select: + fatal ("multilib select `%s' is invalid", + multilib_select); + } ++p; } this_path_len = p - this_path; @@ -7018,7 +7199,7 @@ set_multilib_dir (void) while (*p != ';') { if (*p == '\0') - abort (); + goto invalid_select; if (! ok) { @@ -7030,7 +7211,7 @@ set_multilib_dir (void) while (*p != ' ' && *p != ';') { if (*p == '\0') - abort (); + goto invalid_select; ++p; } @@ -7143,7 +7324,11 @@ print_multilib_info (void) while (*p != ' ') { if (*p == '\0') - abort (); + { + invalid_select: + fatal ("multilib select `%s' is invalid", multilib_select); + } + ++p; } @@ -7177,7 +7362,11 @@ print_multilib_info (void) int mp = 0; if (*e == '\0') - abort (); + { + invalid_exclusion: + fatal ("multilib exclusion `%s' is invalid", + multilib_exclusions); + } if (! m) { @@ -7190,7 +7379,7 @@ print_multilib_info (void) while (*e != ' ' && *e != ';') { if (*e == '\0') - abort (); + goto invalid_exclusion; ++e; } @@ -7201,19 +7390,20 @@ print_multilib_info (void) int len = e - this_arg; if (*q == '\0') - abort (); + goto invalid_select; arg = q; while (*q != ' ' && *q != ';') { if (*q == '\0') - abort (); + goto invalid_select; ++q; } - if (! strncmp (arg, this_arg, (len < q - arg) ? q - arg : len) || - default_arg (this_arg, e - this_arg)) + if (! strncmp (arg, this_arg, + (len < q - arg) ? q - arg : len) + || default_arg (this_arg, e - this_arg)) { mp = 1; break; @@ -7244,7 +7434,8 @@ print_multilib_info (void) if (! skip) { /* If this is a duplicate, skip it. */ - skip = (last_path != 0 && (unsigned int) (p - this_path) == last_path_len + skip = (last_path != 0 + && (unsigned int) (p - this_path) == last_path_len && ! strncmp (last_path, this_path, last_path_len)); last_path = this_path; @@ -7264,7 +7455,7 @@ print_multilib_info (void) const char *arg; if (*q == '\0') - abort (); + goto invalid_select; if (*q == '!') arg = NULL; @@ -7274,7 +7465,7 @@ print_multilib_info (void) while (*q != ' ' && *q != ';') { if (*q == '\0') - abort (); + goto invalid_select; ++q; } @@ -7305,7 +7496,7 @@ print_multilib_info (void) int use_arg; if (*p == '\0') - abort (); + goto invalid_select; if (skip) { @@ -7321,7 +7512,7 @@ print_multilib_info (void) while (*p != ' ' && *p != ';') { if (*p == '\0') - abort (); + goto invalid_select; if (use_arg) putchar (*p); ++p; @@ -7395,3 +7586,24 @@ if_exists_else_spec_function (int argc, const char **argv) return argv[1]; } + +/* replace-outfile built-in spec function. + This looks for the first argument in the outfiles array's name and replaces it + with the second argument. */ + +static const char * +replace_outfile_spec_function (int argc, const char **argv) +{ + int i; + /* Must have exactly two arguments. */ + if (argc != 2) + abort (); + + for (i = 0; i < n_infiles; i++) + { + if (outfiles[i] && !strcmp (outfiles[i], argv[0])) + outfiles[i] = xstrdup (argv[1]); + } + return NULL; +} +