diff options
author | Geoffrey Keating <geoffk@apple.com> | 2003-07-11 08:33:21 +0000 |
---|---|---|
committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2003-07-11 08:33:21 +0000 |
commit | d1bd0ded61f9444ff6350fc7db89d04e72ca1108 (patch) | |
tree | 9b4a93a8c6ef46d7812bac262156dcddbbcf0593 /gcc/gcc.c | |
parent | 6eeba0cc4337f356d68974b8341e84879ec6cd93 (diff) | |
download | gcc-d1bd0ded61f9444ff6350fc7db89d04e72ca1108.zip gcc-d1bd0ded61f9444ff6350fc7db89d04e72ca1108.tar.gz gcc-d1bd0ded61f9444ff6350fc7db89d04e72ca1108.tar.bz2 |
Index: ChangeLog
2003-07-10 Geoffrey Keating <geoffk@apple.com>
* c-decl.c (finish_decl): Handle 'used' here...
* cgraphunit.c (cgraph_finalize_function): ... and here ...
* c-common.c: (handle_used_attribute): ... not here.
* configure.in (onstep): Support --enable-intermodule.
* Makefile.in (OBJS-common): New.
(OBJS-md): New.
(OBJS-archive): New.
(OBJS): Build from OBJS-common, OBJS-md, OBJS-archive.
(OBJS-onestep): New.
(libbackend.a): Support @onestep@.
(libbackend.o): New.
* configure: Regenerate.
* c-common.h (c_reset_state): New prototype.
(c_parse_file): New prototype.
(finish_file): Move prototype from c-tree.h.
* c-decl.c: Include <hashtab.h>.
(builtin_decls): New.
(current_file_decl): New.
(duplicate_decls): Add extra parameter. Change all callers. Don't
output duplicate common symbols.
(link_hash_hash): New.
(link_hash_eq): New.
(poplevel): Handle popping of the top level.
(warn_if_shadowing): Handle TRANSLATION_UNIT_DECL.
(pushdecl): Set DECL_CONTEXT to TRANSLATION_UNIT_DECL if appropriate.
(pushdecl_top_level): Likewise.
(redeclaration_error_message): Handle TRANSLATION_UNIT_DECL.
(c_init_decl_processing): Create TRANSLATION_UNIT_DECL.
(finish_decl): Handle TRANSLATION_UNIT_DECL.
(merge_translation_unit_decls): New.
(c_write_global_declarations): New.
(c_reset_state): New.
(implicitly_declare): Handle TRANSLATION_UNIT_DECL.
* c-lang.c (LANG_HOOKS_WRITE_GLOBALS): New.
* c-objc-common.c (c_cannot_inline_tree_fn): Handle
TRANSLATION_UNIT_DECL.
(c_objc_common_finish_file): Call merge_translation_unit_decls.
* c-opts.c (in_fnames): Rename from in_fname.
(c_common_decode_option): Handle multiple input filenames.
(c_common_post_options): Likewise.
(c_common_parse_file): Likewise; also, call c_parse_file rather than
yyparse.
* c-parse.in: Move cleanup code to c_parse_file.
(free_parser_stacks): Move contents to c_parse_file.
(c_parse_file): New.
* c-tree.h (union lang_tree_node): Chain along TYPE_NEXT_VARIANT
for integer types.
(C_DECL_FILE_SCOPE): New.
(finish_file): Move prototype to c-common.h.
(merge_translation_unit_decls): New prototype.
(comptypes): Add extra parameter to prototype.
(c_write_global_declarations): New prototype.
* c-typeck.c (tagged_types_tu_compatible_p): New.
(function_types_compatible_p): Add extra parameter, change all callers.
(type_lists_compatible_p): Likewise.
(comptypes): Likewise.
(struct tagged_tu_seen): New.
(tagged_tu_seen_base): New.
(build_unary_op): Handle TRANSLATION_UNIT_DECL.
(c_mark_addressable): Remove #if 0 code.
* calls.c (special_function_p): Handle TRANSLATION_UNIT_DECL, add
comment explaining why it shouldn't have to.
* cgraph.h (struct cgraph_node): Add chain_next and chain_prev GTY
options.
* cppinit.c (cpp_read_next_file): New.
(cpp_read_main_file): Use it.
* cpplib.c (undefine_macros): New.
(cpp_undef_all): New.
* cpplib.h (cpp_read_next_file): Prototype.
(cpp_undef_all): Prototype.
* langhooks-def.h (write_global_declarations): Remove prototype.
* toplev.h (write_global_declarations): Add prototype.
* tree.c (decl_type_context): Use switch statement, handle
TRANSLATION_UNIT_DECL.
* tree.def: Update documentation for TRANSLATION_UNIT_DECL.
(TRANSLATION_UNIT_DECL): New kind of tree.
* tree.h: Update documentation for TRANSLATION_UNIT_DECL.
* Makefile.in (c-decl.o): Add $(HASHTAB_H) to dependencies.
* doc/invoke.texi: Make attempt to document new functionality.
2003-05-19 Per Bothner <bothner@apple.com>
* gcc.c (combine_inputs): New.
(process_command): Set combine_inputs.
(do_spec_1): Handle combine_inputs.
(main): Likewise.
Index: cp/ChangeLog
2003-07-10 Geoffrey Keating <geoffk@apple.com>
* decl.c (cp_finish_decl): Handle 'used' attribute.
* cp-lang.c (c_reset_state): New dummy routine.
* cp-tree.h (finish_file): Move prototype to c-common.h.
* parser.c (c_parse_file): Rename from yyparse; don't call finish_file.
From-SVN: r69224
Diffstat (limited to 'gcc/gcc.c')
-rw-r--r-- | gcc/gcc.c | 50 |
1 files changed, 42 insertions, 8 deletions
@@ -2891,6 +2891,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. */ @@ -3715,8 +3720,7 @@ 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"); + combine_inputs = (have_c && have_o && lang_n_infiles > 1); if ((save_temps_flag || report_times) && use_pipes) { @@ -4760,8 +4764,16 @@ do_spec_1 (const char *spec, int inswitch, const char *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++) + store_arg (infiles[i].name, 0, 0); + } + else + { + obstack_grow (&obstack, input_filename, input_filename_length); + arg_going = 1; + } break; case 'I': @@ -6291,7 +6303,28 @@ main (int argc, const char *const *argv) explicit_link_files = xcalloc (1, n_infiles); - for (i = 0; (int) i < n_infiles; i++) + if (combine_inputs) + { + int lang_n_infiles = 0; + for (i = 0; (int) i < n_infiles; i++) + { + const char *name = infiles[i].name; + struct compiler *compiler + = lookup_compiler (name, strlen (name), infiles[i].language); + if (compiler == NULL) + error ("%s: linker input file unused because linking not done", + name); + else if (lang_n_infiles > 0 && compiler != input_file_compiler) + fatal ("cannot specify -o with -c or -S and multiple languages"); + else + { + lang_n_infiles++; + input_file_compiler = compiler; + } + } + } + + for (i = 0; (int) i < (combine_inputs ? 1 : n_infiles); i++) { int this_file_error = 0; @@ -6306,9 +6339,10 @@ main (int argc, const char *const *argv) /* 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); if (input_file_compiler) { |