X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgcc.c;h=f3eecba06218b84da447c7dca859f7a5290156a9;hb=3fd378a3b2e8e8d2ea9645c6664b8d7d38110b8c;hp=d599e4a84e824715e1ac75754423e650c91489cb;hpb=4ea7092218d384d0adb449ce200524b35beea036;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gcc.c b/gcc/gcc.c index d599e4a84e8..f3eecba0621 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -1,6 +1,6 @@ /* Compiler driver program that can handle many languages. Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GCC. @@ -73,6 +73,7 @@ compilation is specified by a string called a "spec". */ #include "config.h" #include "system.h" #include "coretypes.h" +#include "multilib.h" /* before tm.h */ #include "tm.h" #include #if ! defined( SIGCHLD ) && defined( SIGCLD ) @@ -88,7 +89,7 @@ compilation is specified by a string called a "spec". */ #include #endif #if defined (HAVE_DECL_GETRUSAGE) && !HAVE_DECL_GETRUSAGE -extern int getrusage PARAMS ((int, struct rusage *)); +extern int getrusage (int, struct rusage *); #endif /* By default there is no special suffix for target executables. */ @@ -111,14 +112,6 @@ extern int getrusage PARAMS ((int, struct rusage *)); #define TARGET_OBJECT_SUFFIX ".o" #endif -#ifndef VMS -/* FIXME: the location independence code for VMS is hairier than this, - and hasn't been written. */ -#ifndef DIR_UP -#define DIR_UP ".." -#endif /* DIR_UP */ -#endif /* VMS */ - static const char dir_separator_str[] = { DIR_SEPARATOR, 0 }; /* Most every one is fine with LIBRARY_PATH. For some, it conflicts. */ @@ -225,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. */ @@ -293,83 +290,78 @@ static struct rusage rus, prus; /* Forward declaration for prototypes. */ struct path_prefix; - -static void init_spec PARAMS ((void)); -static void store_arg PARAMS ((const char *, int, int)); -static char *load_specs PARAMS ((const char *)); -static void read_specs PARAMS ((const char *, int)); -static void set_spec PARAMS ((const char *, const char *)); -static struct compiler *lookup_compiler PARAMS ((const char *, size_t, const char *)); -static char *build_search_list PARAMS ((struct path_prefix *, const char *, int)); -static void putenv_from_prefixes PARAMS ((struct path_prefix *, const char *)); -static int access_check PARAMS ((const char *, int)); -static char *find_a_file PARAMS ((struct path_prefix *, const char *, - int, int)); -static void add_prefix PARAMS ((struct path_prefix *, const char *, - const char *, int, int, int *, int)); -static void add_sysrooted_prefix PARAMS ((struct path_prefix *, const char *, - const char *, int, int, int *, int)); -static void translate_options PARAMS ((int *, const char *const **)); -static char *skip_whitespace PARAMS ((char *)); -static void delete_if_ordinary PARAMS ((const char *)); -static void delete_temp_files PARAMS ((void)); -static void delete_failure_queue PARAMS ((void)); -static void clear_failure_queue PARAMS ((void)); -static int check_live_switch PARAMS ((int, int)); -static const char *handle_braces PARAMS ((const char *)); -static inline bool input_suffix_matches PARAMS ((const char *, - const char *)); -static inline bool switch_matches PARAMS ((const char *, - const char *, int)); -static inline void mark_matching_switches PARAMS ((const char *, - const char *, int)); -static inline void process_marked_switches PARAMS ((void)); -static const char *process_brace_body PARAMS ((const char *, const char *, - const char *, int, int)); -static const struct spec_function *lookup_spec_function PARAMS ((const char *)); -static const char *eval_spec_function PARAMS ((const char *, const char *)); -static const char *handle_spec_function PARAMS ((const char *)); -static char *save_string PARAMS ((const char *, int)); -static void set_collect_gcc_options PARAMS ((void)); -static int do_spec_1 PARAMS ((const char *, int, const char *)); -static int do_spec_2 PARAMS ((const char *)); -static void do_option_spec PARAMS ((const char *, const char *)); -static void do_self_spec PARAMS ((const char *)); -static const char *find_file PARAMS ((const char *)); -static int is_directory PARAMS ((const char *, const char *, int)); -static const char *validate_switches PARAMS ((const char *)); -static void validate_all_switches PARAMS ((void)); -static inline void validate_switches_from_spec PARAMS ((const char *)); -static void give_switch PARAMS ((int, int)); -static int used_arg PARAMS ((const char *, int)); -static int default_arg PARAMS ((const char *, int)); -static void set_multilib_dir PARAMS ((void)); -static void print_multilib_info PARAMS ((void)); -static void perror_with_name PARAMS ((const char *)); -static void pfatal_pexecute PARAMS ((const char *, const char *)) - ATTRIBUTE_NORETURN; -static void notice PARAMS ((const char *, ...)) - ATTRIBUTE_PRINTF_1; -static void display_help PARAMS ((void)); -static void add_preprocessor_option PARAMS ((const char *, int)); -static void add_assembler_option PARAMS ((const char *, int)); -static void add_linker_option PARAMS ((const char *, int)); -static void process_command PARAMS ((int, const char *const *)); -static int execute PARAMS ((void)); -static void alloc_args PARAMS ((void)); -static void clear_args PARAMS ((void)); -static void fatal_error PARAMS ((int)); -#ifdef ENABLE_SHARED_LIBGCC -static void init_gcc_specs PARAMS ((struct obstack *, - const char *, const char *, - const char *)); +struct prefix_list; + +static void init_spec (void); +static void store_arg (const char *, int, int); +static char *load_specs (const char *); +static void read_specs (const char *, int); +static void set_spec (const char *, const char *); +static struct compiler *lookup_compiler (const char *, size_t, const char *); +static char *build_search_list (struct path_prefix *, const char *, int); +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); +static void add_sysrooted_prefix (struct path_prefix *, const char *, + 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 *); +static void delete_temp_files (void); +static void delete_failure_queue (void); +static void clear_failure_queue (void); +static int check_live_switch (int, int); +static const char *handle_braces (const char *); +static inline bool input_suffix_matches (const char *, const char *); +static inline bool switch_matches (const char *, const char *, int); +static inline void mark_matching_switches (const char *, const char *, int); +static inline void process_marked_switches (void); +static const char *process_brace_body (const char *, const char *, const char *, int, int); +static const struct spec_function *lookup_spec_function (const char *); +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 *); +static void do_self_spec (const char *); +static const char *find_file (const char *); +static int is_directory (const char *, const char *, int); +static const char *validate_switches (const char *); +static void validate_all_switches (void); +static inline void validate_switches_from_spec (const char *); +static void give_switch (int, int); +static int used_arg (const char *, int); +static int default_arg (const char *, int); +static void set_multilib_dir (void); +static void print_multilib_info (void); +static void perror_with_name (const char *); +static void pfatal_pexecute (const char *, const char *) ATTRIBUTE_NORETURN; +static void notice (const char *, ...) ATTRIBUTE_PRINTF_1; +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 **); +static int execute (void); +static void alloc_args (void); +static void clear_args (void); +static void fatal_error (int); +#if defined(ENABLE_SHARED_LIBGCC) && !defined(REAL_LIBGCC_SPEC) +static void init_gcc_specs (struct obstack *, const char *, const char *, + const char *); #endif #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) -static const char *convert_filename PARAMS ((const char *, int, int)); +static const char *convert_filename (const char *, int, int); #endif -static const char *if_exists_spec_function PARAMS ((int, const char **)); -static const char *if_exists_else_spec_function PARAMS ((int, const char **)); +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 @@ -511,9 +503,9 @@ or with constant text in a single argument. name starts with `o'. %{o*} would substitute this text, including the space; thus, two arguments would be generated. %{S*&T*} likewise, but preserve order of S and T options (the order - of S and T in the spec is not significant). Can be any number - of ampersand-separated variables; for each the wild card is - optional. Useful for CPP as %{D*&U*&A*}. + of S and T in the spec is not significant). Can be any number + of ampersand-separated variables; for each the wild card is + optional. Useful for CPP as %{D*&U*&A*}. %{S:X} substitutes X, if the -S switch was given to CC. %{!S:X} substitutes X, if the -S switch was NOT given to CC. @@ -610,10 +602,26 @@ 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 -#if defined(LINK_LIBGCC_SPECIAL) || defined(LINK_LIBGCC_SPECIAL_1) +#if defined(REAL_LIBGCC_SPEC) +#define LIBGCC_SPEC REAL_LIBGCC_SPEC +#elif defined(LINK_LIBGCC_SPECIAL) || defined(LINK_LIBGCC_SPECIAL_1) /* Have gcc do the search for libgcc.a. */ #define LIBGCC_SPEC "libgcc.a%s" #else @@ -692,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:-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 @@ -728,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; @@ -756,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 @@ -770,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*}\ - %{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. */ @@ -781,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}"; @@ -807,7 +822,6 @@ static const char *multilib_select; static const char *multilib_matches; static const char *multilib_defaults; static const char *multilib_exclusions; -#include "multilib.h" /* Check whether a particular argument is a default argument. */ @@ -875,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 @@ -900,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. */ @@ -920,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. */ @@ -945,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)\ @@ -965,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} + /* Mark end of table. */ + {0, 0, 0, 0, 0} }; /* Number of elements in default_compilers, not counting the terminator. */ @@ -1023,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}, @@ -1031,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"}, @@ -1084,14 +1119,12 @@ static const struct option_map option_map[] = {"--static", "-static", 0}, {"--std", "-std=", "aj"}, {"--symbolic", "-symbolic", 0}, - {"--target", "-b", "a"}, {"--time", "-time", 0}, {"--trace-includes", "-H", 0}, {"--traditional", "-traditional", 0}, {"--traditional-cpp", "-traditional-cpp", 0}, {"--trigraphs", "-trigraphs", 0}, {"--undefine-macro", "-U", "aj"}, - {"--use-version", "-V", "a"}, {"--user-dependencies", "-MM", 0}, {"--verbose", "-v", 0}, {"--warn-", "-W", "*j"}, @@ -1117,16 +1150,13 @@ static const struct { and store its length in *ARGVC. */ static void -translate_options (argcp, argvp) - int *argcp; - const char *const **argvp; +translate_options (int *argcp, const char *const **argvp) { int i; int argc = *argcp; const char *const *argv = *argvp; int newvsize = (argc + 2) * 2 * sizeof (const char *); - const char **newv = - (const char **) xmalloc (newvsize); + const char **newv = xmalloc (newvsize); int newindex = 0; i = 0; @@ -1156,7 +1186,7 @@ translate_options (argcp, argvp) } newvsize += spaces * sizeof (const char *); - newv = (const char **) xrealloc (newv, newvsize); + newv = xrealloc (newv, newvsize); sp = target_option_translations[tott_idx].replacements; np = xstrdup (sp); @@ -1329,8 +1359,7 @@ translate_options (argcp, argvp) } static char * -skip_whitespace (p) - char *p; +skip_whitespace (char *p) { while (1) { @@ -1360,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. */ @@ -1399,8 +1427,19 @@ static const char *just_machine_suffix = 0; static const char *gcc_exec_prefix; +/* Adjusted value of standard_libexec_prefix. */ + +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 @@ -1418,36 +1457,26 @@ static const char *gcc_exec_prefix; #define MD_STARTFILE_PREFIX_1 "" #endif -/* Supply defaults for the standard prefixes. */ - -#ifndef STANDARD_EXEC_PREFIX -#define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc-lib/" -#endif -#ifndef STANDARD_STARTFILE_PREFIX -#define STANDARD_STARTFILE_PREFIX "/usr/local/lib/" -#endif -#ifndef TOOLDIR_BASE_PREFIX -#define TOOLDIR_BASE_PREFIX "/usr/local/" -#endif -#ifndef STANDARD_BINDIR_PREFIX -#define STANDARD_BINDIR_PREFIX "/usr/local/bin" -#endif - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -static const char *const standard_exec_prefix_1 = "/usr/lib/gcc/"; +static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/"; +static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/"; 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; static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX; +static const char *standard_libexec_prefix = STANDARD_LIBEXEC_PREFIX; + /* Subdirectory to use for locating libraries. Set by set_multilib_dir based on the compilation options. */ @@ -1500,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), @@ -1544,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 } }; @@ -1552,18 +1584,26 @@ static int processing_spec_function; /* Add appropriate libgcc specs to OBSTACK, taking into account various permutations of -shared-libgcc, -shared, and such. */ -#ifdef ENABLE_SHARED_LIBGCC +#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 (obstack, shared_name, static_name, eh_name) - struct obstack *obstack; - const char *shared_name; - const char *static_name; - const char *eh_name; +init_gcc_specs (struct obstack *obstack, const char *shared_name, + const char *static_name, const char *eh_name) { char *buf; 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:", @@ -1573,6 +1613,7 @@ init_gcc_specs (obstack, shared_name, static_name, eh_name) #else shared_name, #endif +#endif "}}}", NULL); obstack_grow (obstack, buf, strlen (buf)); @@ -1583,7 +1624,7 @@ init_gcc_specs (obstack, shared_name, static_name, eh_name) /* Initialize the specs lookup routines. */ static void -init_spec () +init_spec (void) { struct spec_list *next = (struct spec_list *) 0; struct spec_list *sl = (struct spec_list *) 0; @@ -1596,8 +1637,8 @@ init_spec () notice ("Using built-in specs.\n"); #ifdef EXTRA_SPECS - extra_specs = (struct spec_list *) - xcalloc (sizeof (struct spec_list), ARRAY_SIZE (extra_specs_1)); + extra_specs = xcalloc (sizeof (struct spec_list), + ARRAY_SIZE (extra_specs_1)); for (i = ARRAY_SIZE (extra_specs_1) - 1; i >= 0; i--) { @@ -1622,7 +1663,7 @@ init_spec () next = sl; } -#ifdef ENABLE_SHARED_LIBGCC +#if defined(ENABLE_SHARED_LIBGCC) && !defined(REAL_LIBGCC_SPEC) /* ??? If neither -shared-libgcc nor --static-libgcc was seen, then we should be making an educated guess. Some proposed heuristics for ELF include: @@ -1671,7 +1712,12 @@ init_spec () #endif , "-lgcc", - "-lgcc_eh"); + "-lgcc_eh" +#ifdef USE_LIBUNWIND_EXCEPTIONS + " -lunwind" +#endif + ); + p += 5; in_sep = 0; } @@ -1687,7 +1733,11 @@ init_spec () #endif , "libgcc.a%s", - "libgcc_eh.a%s"); + "libgcc_eh.a%s" +#ifdef USE_LIBUNWIND_EXCEPTIONS + " -lunwind" +#endif + ); p += 10; in_sep = 0; } @@ -1727,9 +1777,7 @@ init_spec () current spec. */ static void -set_spec (name, spec) - const char *name; - const char *spec; +set_spec (const char *name, const char *spec) { struct spec_list *sl; const char *old_spec; @@ -1757,7 +1805,7 @@ set_spec (name, spec) if (!sl) { /* Not found - make it. */ - sl = (struct spec_list *) xmalloc (sizeof (struct spec_list)); + sl = xmalloc (sizeof (struct spec_list)); sl->name = xstrdup (name); sl->name_len = name_len; sl->ptr_spec = &sl->ptr; @@ -1798,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. */ @@ -1826,16 +1879,16 @@ static const char *programname; /* Allocate the argument vector. */ static void -alloc_args () +alloc_args (void) { argbuf_length = 10; - argbuf = (const char **) xmalloc (argbuf_length * sizeof (const char *)); + argbuf = xmalloc (argbuf_length * sizeof (const char *)); } /* Clear out the vector of arguments (after a command is executed). */ static void -clear_args () +clear_args (void) { argbuf_index = 0; } @@ -1848,18 +1901,16 @@ clear_args () and the file should be deleted if this compilation fails. */ static void -store_arg (arg, delete_always, delete_failure) - const char *arg; - int delete_always, delete_failure; +store_arg (const char *arg, int delete_always, int delete_failure) { if (argbuf_index + 1 == argbuf_length) - argbuf - = (const char **) xrealloc (argbuf, - (argbuf_length *= 2) * sizeof (const char *)); + argbuf = xrealloc (argbuf, (argbuf_length *= 2) * sizeof (const char *)); 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); } @@ -1869,8 +1920,7 @@ store_arg (arg, delete_always, delete_failure) a single \n. */ static char * -load_specs (filename) - const char *filename; +load_specs (const char *filename) { int desc; int readlen; @@ -1934,9 +1984,7 @@ load_specs (filename) Anything invalid in the file is a fatal error. */ static void -read_specs (filename, main_p) - const char *filename; - int main_p; +read_specs (const char *filename, int main_p) { char *buffer; char *p; @@ -2148,9 +2196,8 @@ read_specs (filename, main_p) { /* Add this pair to the vector. */ compilers - = ((struct compiler *) - xrealloc (compilers, - (n_compilers + 2) * sizeof (struct compiler))); + = xrealloc (compilers, + (n_compilers + 2) * sizeof (struct compiler)); compilers[n_compilers].suffix = suffix; compilers[n_compilers].spec = spec; @@ -2206,10 +2253,7 @@ static struct temp_file *failure_delete_queue; otherwise delete it in any case. */ void -record_temp_file (filename, always_delete, fail_delete) - const char *filename; - int always_delete; - int fail_delete; +record_temp_file (const char *filename, int always_delete, int fail_delete) { char *const name = xstrdup (filename); @@ -2220,7 +2264,7 @@ record_temp_file (filename, always_delete, fail_delete) if (! strcmp (name, temp->name)) goto already1; - temp = (struct temp_file *) xmalloc (sizeof (struct temp_file)); + temp = xmalloc (sizeof (struct temp_file)); temp->next = always_delete_queue; temp->name = name; always_delete_queue = temp; @@ -2235,7 +2279,7 @@ record_temp_file (filename, always_delete, fail_delete) if (! strcmp (name, temp->name)) goto already2; - temp = (struct temp_file *) xmalloc (sizeof (struct temp_file)); + temp = xmalloc (sizeof (struct temp_file)); temp->next = failure_delete_queue; temp->name = name; failure_delete_queue = temp; @@ -2246,9 +2290,19 @@ record_temp_file (filename, always_delete, 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 (name) - const char *name; +delete_if_ordinary (const char *name) { struct stat st; #ifdef DEBUG @@ -2263,14 +2317,11 @@ delete_if_ordinary (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 -delete_temp_files () +delete_temp_files (void) { struct temp_file *temp; @@ -2282,7 +2333,7 @@ delete_temp_files () /* Delete all the files to be deleted on error. */ static void -delete_failure_queue () +delete_failure_queue (void) { struct temp_file *temp; @@ -2291,7 +2342,7 @@ delete_failure_queue () } static void -clear_failure_queue () +clear_failure_queue (void) { failure_delete_queue = 0; } @@ -2303,10 +2354,8 @@ clear_failure_queue () It is also used by the --print-search-dirs flag. */ static char * -build_search_list (paths, prefix, check_dir_p) - struct path_prefix *paths; - const char *prefix; - int check_dir_p; +build_search_list (struct path_prefix *paths, const char *prefix, + int check_dir_p) { int suffix_len = (machine_suffix) ? strlen (machine_suffix) : 0; int just_suffix_len @@ -2365,9 +2414,7 @@ build_search_list (paths, prefix, check_dir_p) for collect. */ static void -putenv_from_prefixes (paths, env_var) - struct path_prefix *paths; - const char *env_var; +putenv_from_prefixes (struct path_prefix *paths, const char *env_var) { putenv (build_search_list (paths, env_var, 1)); } @@ -2376,9 +2423,7 @@ putenv_from_prefixes (paths, env_var) except that it never considers directories to be executable. */ static int -access_check (name, mode) - const char *name; - int mode; +access_check (const char *name, int mode) { if (mode == X_OK) { @@ -2397,10 +2442,8 @@ access_check (name, mode) Return 0 if not found, otherwise return its name, allocated with malloc. */ static char * -find_a_file (pprefix, name, mode, multilib) - struct path_prefix *pprefix; - const char *name; - int mode, multilib; +find_a_file (struct path_prefix *pprefix, const char *name, int mode, + int multilib) { char *temp; const char *const file_suffix = @@ -2442,7 +2485,7 @@ find_a_file (pprefix, name, mode, multilib) /* Determine the filename to execute (special case for absolute paths). */ - if (IS_ABSOLUTE_PATHNAME (name)) + if (IS_ABSOLUTE_PATH (name)) { if (access (name, mode) == 0) { @@ -2467,11 +2510,7 @@ find_a_file (pprefix, name, mode, multilib) 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. */ @@ -2479,11 +2518,7 @@ find_a_file (pprefix, name, mode, multilib) 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, @@ -2499,22 +2534,14 @@ find_a_file (pprefix, name, mode, multilib) 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 @@ -2529,21 +2556,13 @@ find_a_file (pprefix, name, mode, multilib) 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; } } @@ -2575,15 +2594,9 @@ enum path_prefix_priority 2 means try both machine_suffix and just_machine_suffix. */ static void -add_prefix (pprefix, prefix, component, priority, require_machine_suffix, - warn, os_multilib) - struct path_prefix *pprefix; - const char *prefix; - const char *component; - /* enum prefix_priority */ int priority; - int require_machine_suffix; - int *warn; - int os_multilib; +add_prefix (struct path_prefix *pprefix, const char *prefix, + const char *component, /* enum prefix_priority */ int priority, + int require_machine_suffix, int os_multilib) { struct prefix_list *pl, **prev; int len; @@ -2593,41 +2606,33 @@ add_prefix (pprefix, prefix, component, priority, require_machine_suffix, prev = &(*prev)->next) ; - /* Keep track of the longest prefix */ + /* Keep track of the longest prefix. */ prefix = update_path (prefix, component); len = strlen (prefix); if (len > pprefix->max_len) pprefix->max_len = len; - pl = (struct prefix_list *) xmalloc (sizeof (struct prefix_list)); + 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 */ + /* Insert after PREV. */ pl->next = (*prev); (*prev) = pl; } /* Same as add_prefix, but prepending target_system_root to prefix. */ static void -add_sysrooted_prefix (pprefix, prefix, component, priority, - require_machine_suffix, warn, os_multilib) - struct path_prefix *pprefix; - const char *prefix; - const char *component; - /* enum prefix_priority */ int priority; - int require_machine_suffix; - int *warn; - int os_multilib; +add_sysrooted_prefix (struct path_prefix *pprefix, const char *prefix, + const char *component, + /* enum prefix_priority */ int priority, + int require_machine_suffix, int os_multilib) { - if (!IS_ABSOLUTE_PATHNAME (prefix)) - abort (); + if (!IS_ABSOLUTE_PATH (prefix)) + fatal ("system path `%s' is not absolute", prefix); if (target_system_root) { @@ -2641,7 +2646,7 @@ add_sysrooted_prefix (pprefix, prefix, component, priority, } 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. @@ -2651,7 +2656,7 @@ add_sysrooted_prefix (pprefix, prefix, component, priority, Return 0 if successful, -1 if failed. */ static int -execute () +execute (void) { int i; int n_commands; /* # of command. */ @@ -2665,8 +2670,7 @@ execute () 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++) @@ -2674,7 +2678,7 @@ execute () n_commands++; /* Get storage for each command. */ - commands = (struct command *) alloca (n_commands * sizeof (struct command)); + commands = alloca (n_commands * sizeof (struct command)); /* Split argbuf into its separate piped processes, and record info about each one. @@ -2744,7 +2748,14 @@ execute () } fflush (stderr); if (verbose_only_flag != 0) - return 0; + { + /* verbose_only_flag should act as if the spec was + executed, so increment execution_count before + returning. This prevents spurious warnings about + unused linker input files, etc. */ + execution_count++; + return 0; + } #ifdef DEBUG notice ("\nGo ahead? (y or n) "); fflush (stderr); @@ -2832,8 +2843,7 @@ execute () int pid; pid = pwait (commands[i].pid, &status, 0); - if (pid < 0) - abort (); + gcc_assert (pid >= 0); #ifdef HAVE_GETRUSAGE if (report_times) @@ -2935,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. */ @@ -2943,6 +2956,11 @@ static struct infile *infiles; int n_infiles; +/* True if multiple input files are being compiled to a single + assembly file. */ + +static bool combine_inputs; + /* This counts the number of libraries added by lang_specific_driver, so that we can tell if there were any user supplied any files or libraries. */ @@ -2951,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) @@ -2965,10 +2977,8 @@ static int *warn_std_ptr = 0; is true if we should look for an object suffix. */ static const char * -convert_filename (name, do_exe, do_obj) - const char *name; - int do_exe ATTRIBUTE_UNUSED; - int do_obj ATTRIBUTE_UNUSED; +convert_filename (const char *name, int do_exe ATTRIBUTE_UNUSED, + int do_obj ATTRIBUTE_UNUSED) { #if defined(HAVE_TARGET_EXECUTABLE_SUFFIX) int i; @@ -3018,7 +3028,7 @@ convert_filename (name, do_exe, do_obj) /* Display the command line switches accepted by gcc. */ static void -display_help () +display_help (void) { printf (_("Usage: %s [options] file...\n"), programname); fputs (_("Options:\n"), stdout); @@ -3046,6 +3056,7 @@ display_help () 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); @@ -3078,56 +3089,44 @@ display_help () } static void -add_preprocessor_option (option, len) - const char *option; - int len; +add_preprocessor_option (const char *option, int len) { n_preprocessor_options++; if (! preprocessor_options) - preprocessor_options - = (char **) xmalloc (n_preprocessor_options * sizeof (char *)); + preprocessor_options = xmalloc (n_preprocessor_options * sizeof (char *)); else - preprocessor_options - = (char **) xrealloc (preprocessor_options, - n_preprocessor_options * sizeof (char *)); + preprocessor_options = xrealloc (preprocessor_options, + n_preprocessor_options * sizeof (char *)); preprocessor_options [n_preprocessor_options - 1] = save_string (option, len); } static void -add_assembler_option (option, len) - const char *option; - int len; +add_assembler_option (const char *option, int len) { n_assembler_options++; if (! assembler_options) - assembler_options - = (char **) xmalloc (n_assembler_options * sizeof (char *)); + assembler_options = xmalloc (n_assembler_options * sizeof (char *)); else - assembler_options - = (char **) xrealloc (assembler_options, - n_assembler_options * sizeof (char *)); + assembler_options = xrealloc (assembler_options, + n_assembler_options * sizeof (char *)); assembler_options [n_assembler_options - 1] = save_string (option, len); } static void -add_linker_option (option, len) - const char *option; - int len; +add_linker_option (const char *option, int len) { n_linker_options++; if (! linker_options) - linker_options - = (char **) xmalloc (n_linker_options * sizeof (char *)); + linker_options = xmalloc (n_linker_options * sizeof (char *)); else - linker_options - = (char **) xrealloc (linker_options, - n_linker_options * sizeof (char *)); + linker_options = xrealloc (linker_options, + n_linker_options * sizeof (char *)); linker_options [n_linker_options - 1] = save_string (option, len); } @@ -3136,9 +3135,7 @@ add_linker_option (option, len) Store its length in `n_switches'. */ static void -process_command (argc, argv) - int argc; - const char *const *argv; +process_command (int argc, const char **argv) { int i; const char *temp; @@ -3146,7 +3143,6 @@ process_command (argc, 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; @@ -3183,7 +3179,7 @@ process_command (argc, argv) char **new_argv; char *new_argv0; int baselen; - + while (argc > 1 && argv[1][0] == '-' && (argv[1][1] == 'V' || argv[1][1] == 'b')) { @@ -3212,7 +3208,7 @@ process_command (argc, argv) for (baselen = strlen (progname); baselen > 0; baselen--) if (IS_DIR_SEPARATOR (progname[baselen-1])) break; - new_argv0 = xmemdup (progname, baselen, + new_argv0 = xmemdup (progname, baselen, baselen + concat_length (new_version, new_machine, "-gcc-", NULL) + 1); strcpy (new_argv0 + baselen, new_machine); @@ -3230,37 +3226,46 @@ process_command (argc, argv) /* Set up the default search paths. If there is no GCC_EXEC_PREFIX, see if we can create it from the pathname specified in argv[0]. */ + gcc_libexec_prefix = standard_libexec_prefix; #ifndef VMS /* FIXME: make_relative_prefix doesn't yet work for VMS. */ if (!gcc_exec_prefix) { gcc_exec_prefix = make_relative_prefix (argv[0], standard_bindir_prefix, standard_exec_prefix); + gcc_libexec_prefix = make_relative_prefix (argv[0], + standard_bindir_prefix, + standard_libexec_prefix); if (gcc_exec_prefix) putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL)); } + else + gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix, + standard_exec_prefix, + standard_libexec_prefix); +#else #endif if (gcc_exec_prefix) { int len = strlen (gcc_exec_prefix); - if (len > (int) sizeof ("/lib/gcc-lib/") - 1 + if (len > (int) sizeof ("/lib/gcc/") - 1 && (IS_DIR_SEPARATOR (gcc_exec_prefix[len-1]))) { - temp = gcc_exec_prefix + len - sizeof ("/lib/gcc-lib/") + 1; + temp = gcc_exec_prefix + len - sizeof ("/lib/gcc/") + 1; if (IS_DIR_SEPARATOR (*temp) && strncmp (temp + 1, "lib", 3) == 0 && IS_DIR_SEPARATOR (temp[4]) - && strncmp (temp + 5, "gcc-lib", 7) == 0) - len -= sizeof ("/lib/gcc-lib/") - 1; + && strncmp (temp + 5, "gcc", 3) == 0) + len -= sizeof ("/lib/gcc/") - 1; } set_std_prefix (gcc_exec_prefix, len); - add_prefix (&exec_prefixes, gcc_exec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 0, NULL, 0); + add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC", + 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 @@ -3270,7 +3275,7 @@ process_command (argc, argv) if (temp) { const char *startp, *endp; - char *nstore = (char *) alloca (strlen (temp) + 3); + char *nstore = alloca (strlen (temp) + 3); startp = endp = temp; while (1) @@ -3288,10 +3293,9 @@ process_command (argc, 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; @@ -3305,7 +3309,7 @@ process_command (argc, argv) if (temp && *cross_compile == '0') { const char *startp, *endp; - char *nstore = (char *) alloca (strlen (temp) + 3); + char *nstore = alloca (strlen (temp) + 3); startp = endp = temp; while (1) @@ -3323,7 +3327,7 @@ process_command (argc, 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; @@ -3338,7 +3342,7 @@ process_command (argc, argv) if (temp && *cross_compile == '0') { const char *startp, *endp; - char *nstore = (char *) alloca (strlen (temp) + 3); + char *nstore = alloca (strlen (temp) + 3); startp = endp = temp; while (1) @@ -3356,7 +3360,7 @@ process_command (argc, 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; @@ -3367,10 +3371,10 @@ process_command (argc, 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. @@ -3402,8 +3406,8 @@ process_command (argc, argv) { /* translate_options () has turned --version into -fversion. */ printf (_("%s (GCC) %s\n"), programname, version_string); - fputs (_("Copyright (C) 2003 Free Software Foundation, Inc.\n"), - stdout); + printf ("Copyright %s 2004 Free Software Foundation, Inc.\n", + _("(C)")); fputs (_("This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"), stdout); @@ -3539,10 +3543,14 @@ 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 = (struct user_specs *) - xmalloc (sizeof (struct user_specs)); + struct user_specs *user = xmalloc (sizeof (struct user_specs)); if (++i >= argc) fatal ("argument to `-specs' is missing"); @@ -3556,8 +3564,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" } else if (strncmp (argv[i], "-specs=", 7) == 0) { - struct user_specs *user = (struct user_specs *) - xmalloc (sizeof (struct user_specs)); + struct user_specs *user = xmalloc (sizeof (struct user_specs)); if (strlen (argv[i]) == 7) fatal ("argument to `-specs=' is missing"); @@ -3640,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; @@ -3683,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) { @@ -3730,9 +3735,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" for (j = 0; j < ARRAY_SIZE (modify_target); j++) if (! strcmp (argv[i], modify_target[j].sw)) { - char *new_name - = (char *) xmalloc (strlen (modify_target[j].str) - + strlen (spec_machine)); + char *new_name = xmalloc (strlen (modify_target[j].str) + + strlen (spec_machine)); const char *p, *r; char *q; int made_addition = 0; @@ -3777,9 +3781,6 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" } } - if (have_c && have_o && lang_n_infiles > 1) - fatal ("cannot specify -o with -c or -S and multiple compilations"); - if ((save_temps_flag || report_times) && use_pipes) { /* -save-temps overrides -pipe, so that temp files are produced */ @@ -3792,7 +3793,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" use_pipes = 0; } - + /* Set up the search paths before we go looking for config files. */ /* These come before the md prefixes so that we will find gcc's subcommands @@ -3800,18 +3801,22 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" /* Use 2 as fourth arg meaning try just the machine as a suffix, as well as trying the machine and the version. */ #ifndef OS2 - add_prefix (&exec_prefixes, standard_exec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); + add_prefix (&exec_prefixes, standard_libexec_prefix, "GCC", + PREFIX_PRIORITY_LAST, 1, 0); + add_prefix (&exec_prefixes, standard_libexec_prefix, "BINUTILS", + 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, 0); #endif add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS", - PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0); - add_prefix (&startfile_prefixes, standard_exec_prefix_1, "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, 0); tooldir_prefix = concat (tooldir_base_prefix, spec_machine, dir_separator_str, NULL); @@ -3823,7 +3828,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" directories, so that we can search both the user specified directory and the standard place. */ - if (!IS_ABSOLUTE_PATHNAME (tooldir_prefix)) + if (!IS_ABSOLUTE_PATH (tooldir_prefix)) { if (gcc_exec_prefix) { @@ -3834,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, @@ -3848,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, @@ -3876,9 +3881,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" /* Then create the space for the vectors and scan again. */ - switches = ((struct switchstr *) - xmalloc ((n_switches + 1) * sizeof (struct switchstr))); - infiles = (struct infile *) xmalloc ((n_infiles + 1) * sizeof (struct infile)); + switches = xmalloc ((n_switches + 1) * sizeof (struct switchstr)); + infiles = xmalloc ((n_infiles + 1) * sizeof (struct infile)); n_switches = 0; n_infiles = 0; last_language_n_infiles = -1; @@ -4027,7 +4031,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" if (i + n_args >= argc) fatal ("argument to `-%s' is missing", p); switches[n_switches].args - = (const char **) xmalloc ((n_args + 1) * sizeof(const char *)); + = xmalloc ((n_args + 1) * sizeof(const char *)); while (j < n_args) switches[n_switches].args[j++] = argv[++i]; /* Null-terminate the vector. */ @@ -4037,13 +4041,12 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" { /* On some systems, ld cannot handle some options without a space. So split the option from its argument. */ - char *part1 = (char *) xmalloc (2); + char *part1 = xmalloc (2); part1[0] = c; part1[1] = '\0'; switches[n_switches].part1 = part1; - switches[n_switches].args - = (const char **) xmalloc (2 * sizeof (const char *)); + switches[n_switches].args = xmalloc (2 * sizeof (const char *)); switches[n_switches].args[0] = xstrdup (p+1); switches[n_switches].args[1] = 0; } @@ -4128,7 +4131,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" and place that in the environment. */ static void -set_collect_gcc_options () +set_collect_gcc_options (void) { int i; int first_time; @@ -4197,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. */ @@ -4233,8 +4238,7 @@ static const char *suffix_subst; Returns 0 if the spec is successfully processed; -1 if failed. */ int -do_spec (spec) - const char *spec; +do_spec (const char *spec) { int value; @@ -4257,8 +4261,7 @@ do_spec (spec) } static int -do_spec_2 (spec) - const char *spec; +do_spec_2 (const char *spec) { const char *string; int result; @@ -4294,9 +4297,7 @@ do_spec_2 (spec) of the switches/n_switches array. */ static void -do_option_spec (name, spec) - const char *name; - const char *spec; +do_option_spec (const char *name, const char *spec) { unsigned int i, value_count, value_len; const char *p, *q, *value; @@ -4345,8 +4346,7 @@ do_option_spec (name, spec) of the switches/n_switches array. */ static void -do_self_spec (spec) - const char *spec; +do_self_spec (const char *spec) { do_spec_2 (spec); do_spec_1 (" ", 0, NULL); @@ -4367,7 +4367,7 @@ do_self_spec (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]; @@ -4379,6 +4379,107 @@ do_self_spec (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 @@ -4392,10 +4493,7 @@ do_self_spec (spec) and the command on that line reported an error. */ static int -do_spec_1 (spec, inswitch, soft_matched_part) - const char *spec; - int inswitch; - const char *soft_matched_part; +do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) { const char *p = spec; int c; @@ -4496,7 +4594,7 @@ do_spec_1 (spec, inswitch, 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); @@ -4518,110 +4616,22 @@ do_spec_1 (spec, inswitch, soft_matched_part) case 'D': { struct prefix_list *pl = startfile_prefixes.plist; - size_t bufsize = 100; - char *buffer = (char *) 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_PATHNAME (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 = (char *) 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 = (char *) 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 = (char *) 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; @@ -4633,7 +4643,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) char *buf; while (*p != 0 && *p != '\n') p++; - buf = (char *) alloca (p - q + 1); + buf = alloca (p - q + 1); strncpy (buf, q, p - q); buf[p - q] = 0; error ("%s", buf); @@ -4647,7 +4657,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) char *buf; while (*p != 0 && *p != '\n') p++; - buf = (char *) alloca (p - q + 1); + buf = alloca (p - q + 1); strncpy (buf, q, p - q); buf[p - q] = 0; notice ("%s\n", buf); @@ -4689,7 +4699,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) p++; if (p[0] == '%' && p[1] == 'O') p += 2; - + break; } goto create_temp_file; @@ -4701,7 +4711,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) p++; if (p[0] == '%' && p[1] == 'O') p += 2; - + break; } goto create_temp_file; @@ -4723,14 +4733,14 @@ do_spec_1 (spec, inswitch, 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 { saved_suffix - = (char *) xmalloc (suffix_length - + strlen (TARGET_OBJECT_SUFFIX)); + = xmalloc (suffix_length + + strlen (TARGET_OBJECT_SUFFIX)); strncpy (saved_suffix, suffix, suffix_length); strcpy (saved_suffix + suffix_length, TARGET_OBJECT_SUFFIX); @@ -4752,34 +4762,43 @@ do_spec_1 (spec, inswitch, soft_matched_part) temp_filename = alloca (temp_filename_length + 1); strncpy ((char *) temp_filename, input_basename, basename_length); strncpy ((char *) temp_filename + basename_length, suffix, - suffix_length); + suffix_length); *((char *) temp_filename + temp_filename_length) = '\0'; if (strcmp (temp_filename, input_filename) != 0) { - struct stat st_temp; +#ifndef HOST_LACKS_INODE_NUMBERS + struct stat st_temp; - /* Note, set_input() resets input_stat_set to 0. */ - if (input_stat_set == 0) - { - input_stat_set = stat (input_filename, &input_stat); - if (input_stat_set >= 0) - input_stat_set = 1; - } - - /* If we have the stat for the input_filename - 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. */ + /* Note, set_input() resets input_stat_set to 0. */ + if (input_stat_set == 0) + { + input_stat_set = stat (input_filename, &input_stat); + if (input_stat_set >= 0) + input_stat_set = 1; + } + /* If we have the stat for the input_filename + 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); obstack_grow (&obstack, temp_filename, - temp_filename_length); + temp_filename_length); arg_going = 1; delete_this_arg = 0; break; @@ -4801,7 +4820,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) { if (t == 0) { - t = (struct temp_name *) xmalloc (sizeof (struct temp_name)); + t = xmalloc (sizeof (struct temp_name)); t->next = temp_names; temp_names = t; } @@ -4830,8 +4849,21 @@ do_spec_1 (spec, inswitch, soft_matched_part) break; case 'i': - obstack_grow (&obstack, input_filename, input_filename_length); - arg_going = 1; + if (combine_inputs) + { + for (i = 0; (int) i < n_infiles; i++) + 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 + { + obstack_grow (&obstack, input_filename, input_filename_length); + arg_going = 1; + } break; case 'I': @@ -4860,13 +4892,8 @@ do_spec_1 (spec, inswitch, 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; @@ -4903,7 +4930,7 @@ do_spec_1 (spec, inswitch, 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; @@ -4934,7 +4961,7 @@ do_spec_1 (spec, inswitch, 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); @@ -5066,11 +5093,11 @@ do_spec_1 (spec, inswitch, soft_matched_part) /* We assume there is a directory separator at the end of this string. */ if (target_system_root) - { - obstack_grow (&obstack, target_system_root, + { + obstack_grow (&obstack, target_system_root, strlen (target_system_root)); if (target_sysroot_suffix) - obstack_grow (&obstack, target_sysroot_suffix, + obstack_grow (&obstack, target_sysroot_suffix, strlen (target_sysroot_suffix)); } break; @@ -5144,7 +5171,7 @@ do_spec_1 (spec, inswitch, 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; @@ -5189,7 +5216,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) } else { - char *x = (char *) alloca (strlen (name) * 2 + 1); + char *x = alloca (strlen (name) * 2 + 1); char *buf = x; const char *y = name; int flag = 0; @@ -5245,7 +5272,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) /* Backslash: treat next character as ordinary. */ c = *p++; - /* fall through */ + /* Fall through. */ default: /* Ordinary character: put it into the current argument. */ obstack_1grow (&obstack, c); @@ -5272,8 +5299,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) /* Look up a spec function. */ static const struct spec_function * -lookup_spec_function (name) - const char *name; +lookup_spec_function (const char *name) { static const struct spec_function * const spec_function_tables[] = { @@ -5296,8 +5322,7 @@ lookup_spec_function (name) /* Evaluate a spec function. */ static const char * -eval_spec_function (func, args) - const char *func, *args; +eval_spec_function (const char *func, const char *args) { const struct spec_function *sf; const char *funcval; @@ -5369,8 +5394,7 @@ eval_spec_function (func, args) NULL if no processing is required. */ static const char * -handle_spec_function (p) - const char *p; +handle_spec_function (const char *p) { char *func, *args; const char *endp, *funcval; @@ -5428,9 +5452,7 @@ handle_spec_function (p) /* Inline subroutine of handle_braces. Returns true if the current input suffix matches the atom bracketed by ATOM and END_ATOM. */ static inline bool -input_suffix_matches (atom, end_atom) - const char *atom; - const char *end_atom; +input_suffix_matches (const char *atom, const char *end_atom) { return (input_suffix && !strncmp (input_suffix, atom, end_atom - atom) @@ -5441,10 +5463,7 @@ input_suffix_matches (atom, end_atom) matching the atom bracketed by ATOM and END_ATOM appeared on the command line. */ static inline bool -switch_matches (atom, end_atom, starred) - const char *atom; - const char *end_atom; - int starred; +switch_matches (const char *atom, const char *end_atom, int starred) { int i; int len = end_atom - atom; @@ -5463,10 +5482,7 @@ switch_matches (atom, end_atom, starred) match ATOM (extends to END_ATOM; STARRED indicates whether there was a star after the atom) for later processing. */ static inline void -mark_matching_switches (atom, end_atom, starred) - const char *atom; - const char *end_atom; - int starred; +mark_matching_switches (const char *atom, const char *end_atom, int starred) { int i; int len = end_atom - atom; @@ -5482,7 +5498,7 @@ mark_matching_switches (atom, end_atom, starred) /* Inline subroutine of handle_braces. Process all the currently marked switches through give_switch, and clear the marks. */ static inline void -process_marked_switches () +process_marked_switches (void) { int i; @@ -5499,11 +5515,11 @@ process_marked_switches () if we call do_spec_1 and that returns -1. */ static const char * -handle_braces (p) - const char *p; +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; @@ -5523,7 +5539,7 @@ handle_braces (p) do { if (a_must_be_last) - abort (); + goto invalid; /* Scan one "atom" (S in the description above of %{}, possibly with !, ., or * modifiers). */ @@ -5547,32 +5563,33 @@ handle_braces (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". */ @@ -5583,7 +5600,7 @@ handle_braces (p) else { if (a_is_suffix && a_is_starred) - abort (); + goto invalid; if (!a_is_starred) disj_starred = false; @@ -5626,14 +5643,19 @@ handle_braces (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 } @@ -5648,12 +5670,8 @@ handle_braces (p) returns -1. */ static const char * -process_brace_body (p, atom, end_atom, starred, matched) - const char *p; - const char *atom; - const char *end_atom; - int starred; - int matched; +process_brace_body (const char *p, const char *atom, const char *end_atom, + int starred, int matched) { const char *body, *end_body; unsigned int nesting_level; @@ -5677,16 +5695,16 @@ process_brace_body (p, atom, end_atom, starred, matched) else if (*p == '%' && p[1] == '*' && nesting_level == 1) have_subst = true; else if (*p == '\0') - abort (); + goto invalid; p++; } - + end_body = p; while (end_body[-1] == ' ' || end_body[-1] == '\t') end_body--; if (have_subst && !starred) - abort (); + goto invalid; if (matched) { @@ -5722,6 +5740,9 @@ process_brace_body (p, atom, end_atom, starred, matched) } return p; + + invalid: + fatal ("braced spec body `%s' is invalid", body); } /* Return 0 iff switch number SWITCHNUM is obsoleted by a later switch @@ -5733,9 +5754,7 @@ process_brace_body (p, atom, end_atom, starred, matched) with the "no-", similarly for a switch with the "no-" prefix. */ static int -check_live_switch (switchnum, prefix_length) - int switchnum; - int prefix_length; +check_live_switch (int switchnum, int prefix_length) { const char *name = switches[switchnum].part1; int i; @@ -5809,9 +5828,7 @@ check_live_switch (switchnum, prefix_length) If OMIT_FIRST_WORD is nonzero, then we omit .part1 of the argument. */ static void -give_switch (switchnum, omit_first_word) - int switchnum; - int omit_first_word; +give_switch (int switchnum, int omit_first_word) { if (switches[switchnum].live_cond == SWITCH_IGNORE) return; @@ -5861,8 +5878,7 @@ give_switch (switchnum, omit_first_word) Return the absolute file name found. If nothing is found, return NAME. */ static const char * -find_file (name) - const char *name; +find_file (const char *name) { char *newname; @@ -5887,14 +5903,11 @@ find_file (name) limit. */ static int -is_directory (path1, path2, linker) - const char *path1; - const char *path2; - int linker; +is_directory (const char *path1, const char *path2, int linker) { int len1 = strlen (path1); int len2 = strlen (path2); - char *path = (char *) alloca (3 + len1 + len2); + char *path = alloca (3 + len1 + len2); char *cp; struct stat st; @@ -5932,8 +5945,7 @@ is_directory (path1, path2, linker) the input file named FILENAME. */ void -set_input (filename) - const char *filename; +set_input (const char *filename) { const char *p; @@ -5974,8 +5986,7 @@ set_input (filename) /* On fatal signals, delete all the temporary files. */ static void -fatal_error (signum) - int signum; +fatal_error (int signum) { signal (signum, SIG_DFL); delete_failure_queue (); @@ -5985,16 +5996,15 @@ fatal_error (signum) kill (getpid (), signum); } -extern int main PARAMS ((int, const char *const *)); +extern int main (int, const char **); int -main (argc, argv) - 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; @@ -6102,9 +6112,8 @@ main (argc, argv) /* Initialize the vector of specs to just the default. This means one element containing 0s, as a terminator. */ - compilers = (struct compiler *) xmalloc (sizeof default_compilers); - memcpy ((char *) compilers, (char *) default_compilers, - sizeof default_compilers); + compilers = xmalloc (sizeof default_compilers); + memcpy (compilers, default_compilers, sizeof default_compilers); n_compilers = n_default_compilers; /* Read specs from a file if there is one. */ @@ -6122,9 +6131,8 @@ main (argc, argv) /* We need to check standard_exec_prefix/just_machine_suffix/specs for any override of as, ld and libraries. */ - specs_file = (char *) alloca (strlen (standard_exec_prefix) - + strlen (just_machine_suffix) - + sizeof ("specs")); + specs_file = alloca (strlen (standard_exec_prefix) + + strlen (just_machine_suffix) + sizeof ("specs")); strcpy (specs_file, standard_exec_prefix); strcat (specs_file, just_machine_suffix); @@ -6151,11 +6159,11 @@ main (argc, argv) if (*md_exec_prefix) { add_prefix (&exec_prefixes, md_exec_prefix, "GCC", - PREFIX_PRIORITY_LAST, 0, NULL, 0); + PREFIX_PRIORITY_LAST, 0, 0); } } - /* Process sysroot_suffix_spec. */ + /* Process sysroot_suffix_spec. */ if (*sysroot_suffix_spec != 0 && do_spec_2 (sysroot_suffix_spec) == 0) { @@ -6165,7 +6173,7 @@ main (argc, argv) target_sysroot_suffix = xstrdup (argbuf[argbuf_index -1]); } - /* Process sysroot_hdrs_suffix_spec. */ + /* Process sysroot_hdrs_suffix_spec. */ if (*sysroot_hdrs_suffix_spec != 0 && do_spec_2 (sysroot_hdrs_suffix_spec) == 0) { @@ -6183,7 +6191,7 @@ main (argc, 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. */ @@ -6191,46 +6199,49 @@ main (argc, 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 as a unit. If GCC_EXEC_PREFIX is defined, base - standard_startfile_prefix on that as well. */ - if (IS_ABSOLUTE_PATHNAME (standard_startfile_prefix)) + standard_startfile_prefix on that as well. + + If the prefix is relative, only search it for native compilers; + otherwise we will search a directory containing host libraries. */ + if (IS_ABSOLUTE_PATH (standard_startfile_prefix)) add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix, "BINUTILS", - PREFIX_PRIORITY_LAST, 0, NULL, 1); - else + 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 @@ -6383,12 +6394,102 @@ main (argc, argv) i = n_infiles; i += lang_specific_extra_outfiles; - outfiles = (const char **) xcalloc (i, sizeof (char *)); + outfiles = xcalloc (i, sizeof (char *)); /* Record which files were specified explicitly as link input. */ explicit_link_files = xcalloc (1, n_infiles); + if (combine_flag) + combine_inputs = true; + else + combine_inputs = false; + + 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 && !(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; + } + + 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; @@ -6398,15 +6499,21 @@ main (argc, 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; /* Figure out which compiler from the file's suffix. */ - input_file_compiler - = lookup_compiler (infiles[i].name, input_filename_length, - infiles[i].language); + if (! combine_inputs) + 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) { @@ -6421,6 +6528,7 @@ main (argc, argv) else { value = do_spec (input_file_compiler->spec); + infiles[i].compiled = true; if (value < 0) this_file_error = 1; } @@ -6439,6 +6547,7 @@ main (argc, argv) { delete_failure_queue (); error_count++; + break; } /* If this compilation succeeded, don't delete those files later. */ clear_failure_queue (); @@ -6520,10 +6629,7 @@ main (argc, argv) or 0 if this file is to be passed to the linker. */ static struct compiler * -lookup_compiler (name, length, language) - const char *name; - size_t length; - const char *language; +lookup_compiler (const char *name, size_t length, const char *language) { struct compiler *cp; @@ -6556,7 +6662,7 @@ lookup_compiler (name, length, 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--) { @@ -6589,9 +6695,7 @@ lookup_compiler (name, length, language) } static char * -save_string (s, len) - const char *s; - int len; +save_string (const char *s, int len) { char *result = xmalloc (len + 1); @@ -6601,8 +6705,7 @@ save_string (s, len) } void -pfatal_with_name (name) - const char *name; +pfatal_with_name (const char *name) { perror_with_name (name); delete_temp_files (); @@ -6610,16 +6713,13 @@ pfatal_with_name (name) } static void -perror_with_name (name) - const char *name; +perror_with_name (const char *name) { error ("%s: %s", name, xstrerror (errno)); } static void -pfatal_pexecute (errmsg_fmt, errmsg_arg) - const char *errmsg_fmt; - const char *errmsg_arg; +pfatal_pexecute (const char *errmsg_fmt, const char *errmsg_arg) { if (errmsg_arg) { @@ -6636,21 +6736,21 @@ pfatal_pexecute (errmsg_fmt, errmsg_arg) pfatal_with_name (errmsg_fmt); } -/* Output an error message and exit */ +/* Output an error message and exit. */ void -fancy_abort () +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 */ +/* Output an error message and exit. */ void fatal (const char *msgid, ...) { va_list ap; - + va_start (ap, msgid); fprintf (stderr, "%s: ", programname); @@ -6665,7 +6765,7 @@ void error (const char *msgid, ...) { va_list ap; - + va_start (ap, msgid); fprintf (stderr, "%s: ", programname); vfprintf (stderr, _(msgid), ap); @@ -6678,15 +6778,14 @@ static void notice (const char *msgid, ...) { va_list ap; - + va_start (ap, msgid); vfprintf (stderr, _(msgid), ap); va_end (ap); } static inline void -validate_switches_from_spec (spec) - const char *spec; +validate_switches_from_spec (const char *spec) { const char *p = spec; char c; @@ -6697,7 +6796,7 @@ validate_switches_from_spec (spec) } static void -validate_all_switches () +validate_all_switches (void) { struct compiler *comp; struct spec_list *spec; @@ -6716,8 +6815,7 @@ validate_all_switches () and mark as valid all supplied switches that match it. */ static const char * -validate_switches (start) - const char *start; +validate_switches (const char *start) { const char *p = start; const char *atom; @@ -6725,9 +6823,9 @@ validate_switches (start) int i; bool suffix = false; bool starred = false; - + #define SKIP_WHITE() do { while (*p == ' ' || *p == '\t') p++; } while (0) - + next_member: SKIP_WHITE (); @@ -6800,9 +6898,7 @@ static int n_mdswitches; canonicalize the switches to keep only the ones we care about. */ static int -used_arg (p, len) - const char *p; - int len; +used_arg (const char *p, int len) { struct mswitchstr { @@ -6828,8 +6924,7 @@ used_arg (p, len) if (*q == ';') cnt++; - matches = - (struct mswitchstr *) alloca ((sizeof (struct mswitchstr)) * cnt); + matches = alloca ((sizeof (struct mswitchstr)) * cnt); i = 0; q = multilib_matches; while (*q != '\0') @@ -6838,7 +6933,10 @@ used_arg (p, 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; @@ -6847,7 +6945,7 @@ used_arg (p, len) while (*q != ';' && *q != '\0') { if (*q == ' ') - abort (); + goto invalid_matches; q++; } matches[i].rep_len = q - matches[i].replace; @@ -6861,24 +6959,24 @@ used_arg (p, len) xmalloc from calling fatal, and prevents us from re-executing this block of code. */ mswitches - = (struct mswitchstr *) - xmalloc (sizeof (struct mswitchstr) + = 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 @@ -6940,9 +7038,7 @@ used_arg (p, len) } static int -default_arg (p, len) - const char *p; - int len; +default_arg (const char *p, int len) { int i; @@ -6965,7 +7061,7 @@ default_arg (p, len) will be used. */ static void -set_multilib_dir () +set_multilib_dir (void) { const char *p; unsigned int this_path_len; @@ -6991,9 +7087,7 @@ set_multilib_dir () { int i = 0; - mdswitches - = (struct mdswitchstr *) xmalloc (sizeof (struct mdswitchstr) - * n_mdswitches); + mdswitches = xmalloc (sizeof (struct mdswitchstr) * n_mdswitches); for (start = multilib_defaults; *start != '\0'; start = end + 1) { while (*start == ' ' || *start == '\t') @@ -7001,7 +7095,7 @@ set_multilib_dir () if (*start == '\0') break; - + for (end = start + 1; *end != ' ' && *end != '\t' && *end != '\0'; end++) ; @@ -7031,7 +7125,11 @@ set_multilib_dir () while (*p != ';') { if (*p == '\0') - abort (); + { + invalid_exclusions: + fatal ("multilib exclusions `%s' is invalid", + multilib_exclusions); + } if (! ok) { @@ -7043,7 +7141,7 @@ set_multilib_dir () while (*p != ' ' && *p != ';') { if (*p == '\0') - abort (); + goto invalid_exclusions; ++p; } @@ -7085,7 +7183,11 @@ set_multilib_dir () while (*p != ' ') { if (*p == '\0') - abort (); + { + invalid_select: + fatal ("multilib select `%s' is invalid", + multilib_select); + } ++p; } this_path_len = p - this_path; @@ -7097,7 +7199,7 @@ set_multilib_dir () while (*p != ';') { if (*p == '\0') - abort (); + goto invalid_select; if (! ok) { @@ -7109,7 +7211,7 @@ set_multilib_dir () while (*p != ' ' && *p != ';') { if (*p == '\0') - abort (); + goto invalid_select; ++p; } @@ -7200,7 +7302,7 @@ set_multilib_dir () the exclusions. */ static void -print_multilib_info () +print_multilib_info (void) { const char *p = multilib_select; const char *last_path = 0, *this_path; @@ -7222,7 +7324,11 @@ print_multilib_info () while (*p != ' ') { if (*p == '\0') - abort (); + { + invalid_select: + fatal ("multilib select `%s' is invalid", multilib_select); + } + ++p; } @@ -7256,7 +7362,11 @@ print_multilib_info () int mp = 0; if (*e == '\0') - abort (); + { + invalid_exclusion: + fatal ("multilib exclusion `%s' is invalid", + multilib_exclusions); + } if (! m) { @@ -7269,7 +7379,7 @@ print_multilib_info () while (*e != ' ' && *e != ';') { if (*e == '\0') - abort (); + goto invalid_exclusion; ++e; } @@ -7280,19 +7390,20 @@ print_multilib_info () 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; @@ -7323,7 +7434,8 @@ print_multilib_info () 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; @@ -7343,7 +7455,7 @@ print_multilib_info () const char *arg; if (*q == '\0') - abort (); + goto invalid_select; if (*q == '!') arg = NULL; @@ -7353,7 +7465,7 @@ print_multilib_info () while (*q != ' ' && *q != ';') { if (*q == '\0') - abort (); + goto invalid_select; ++q; } @@ -7384,7 +7496,7 @@ print_multilib_info () int use_arg; if (*p == '\0') - abort (); + goto invalid_select; if (skip) { @@ -7400,7 +7512,7 @@ print_multilib_info () while (*p != ' ' && *p != ';') { if (*p == '\0') - abort (); + goto invalid_select; if (use_arg) putchar (*p); ++p; @@ -7448,12 +7560,10 @@ print_multilib_info () (whose name has been expanded with %s). */ static const char * -if_exists_spec_function (argc, argv) - int argc; - const char **argv; +if_exists_spec_function (int argc, const char **argv) { /* Must have only one argument. */ - if (argc == 1 && IS_ABSOLUTE_PATHNAME (argv[0]) && ! access (argv[0], R_OK)) + if (argc == 1 && IS_ABSOLUTE_PATH (argv[0]) && ! access (argv[0], R_OK)) return argv[0]; return NULL; @@ -7465,16 +7575,35 @@ if_exists_spec_function (argc, argv) is returned if the first argument does not exist. */ static const char * -if_exists_else_spec_function (argc, argv) - int argc; - const char **argv; +if_exists_else_spec_function (int argc, const char **argv) { /* Must have exactly two arguments. */ if (argc != 2) return NULL; - if (IS_ABSOLUTE_PATHNAME (argv[0]) && ! access (argv[0], R_OK)) + if (IS_ABSOLUTE_PATH (argv[0]) && ! access (argv[0], R_OK)) return argv[0]; 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; +} +