diff options
author | Ian Lance Taylor <ian@airs.com> | 2009-09-30 22:21:13 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 2009-09-30 22:21:13 +0000 |
commit | 029ba973354c8eb02c476d3ba8c7f555344afdce (patch) | |
tree | ceb131579a7bb043a19b5bea27b391bcf57126e8 /gold/fileread.cc | |
parent | 27a5525e751940f55974e64bdcf11f504e68d356 (diff) | |
download | gdb-029ba973354c8eb02c476d3ba8c7f555344afdce.zip gdb-029ba973354c8eb02c476d3ba8c7f555344afdce.tar.gz gdb-029ba973354c8eb02c476d3ba8c7f555344afdce.tar.bz2 |
* object.h (class Object): Remove target_ field, and target,
sized_target, and set_target methods.
(Object::sized_target): Remove.
(class Sized_relobj): Update declarations. Remove sized_target.
* object.cc (Sized_relobj::setup): Remove target parameter.
Change all callers.
(Input_objects::add_object): Don't do anything with the target.
(make_elf_sized_object): Add punconfigured parameter. Change all
callers. Set or test parameter target.
* dynobj.cc (Sized_dynobj::target): Remove target parameter.
Change all callers.
* parameters.cc (Parameters::set_target): Change parameter type to
be non-const.
(Parameters::default_target): Remove.
(set_parameters_target): Change parameter type to be non-const.
(parameters_force_valid_target): New function.
(parameters_clear_target): New function.
* parameters.h (class Parameters): Update declarations. Remove
default_target method. Add sized_target and clear_target
methods. Change target_ to be non-const.
(set_parameters_target): Update declaration.
(parameters_force_valid_target): Declare.
(parameters_clear_target): Declare.
* readsyms.cc (Read_symbols::do_read_symbols): Pass punconfigured
as NULL if we aren't searching.
(Add_symbols::run): Don't check for compatible target.
* fileread.cc (Input_file::open_binary): Call
parameters_force_valid_target.
* gold.cc (queue_middle_tasks): Likewise.
* plugin.cc (make_sized_plugin_object): Likewise. Don't call
set_target on object.
* dynobj.h (class Sized_dynobj): Update declarations.
* archive.cc (Archive::get_elf_object_for_member): Return NULL if
make_elf_object returns NULL.
(Archive::include_member): Don't check whether object target is
compatible.
* output.cc (Output_section::add_input_section): Get target from
parameters.
(Output_section::relax_input_section): Likewise.
* reloc.cc (Sized_relobj::do_gc_process_relocs): Get target from
parameters.
(Sized_relobj::do_scan_relocs): Likewise.
(Sized_relobj::relocate_sections): Likewise.
* resolve.cc (Symbol_table::resolve): Likewise.
* symtab.cc (Symbol_table::wrap_symbol): Likewise. Remove object
parameter. Change all callers.
(Symbol_table::add_from_object): Get target from parameters.
(Symbol_table::add_from_relobj): Don't check object target.
(Symbol_table::add_from_dynobj): Likewise.
(Symbol_table::define_special_symbol): Get target from
parameters.
* symtab.h (class Symbol_table): Update declaration.
* testsuite/binary_unittest.cc (gold_testsuite): Remove target
parameter. Change all callers. Clear parameter target.
(Binary_test): Test target here.
* testsuite/object_unittest.cc (gold_testsuite): Remove
target_test_pointer parameter. Change all callers.
(Object_test): Test target here.
Diffstat (limited to 'gold/fileread.cc')
-rw-r--r-- | gold/fileread.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gold/fileread.cc b/gold/fileread.cc index bb10aa9..02f0571 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -898,15 +898,12 @@ Input_file::open_binary(const Task* task, const std::string& name) // In order to open a binary file, we need machine code, size, and // endianness. We may not have a valid target at this point, in // which case we use the default target. - const Target* target; - if (parameters->target_valid()) - target = ¶meters->target(); - else - target = ¶meters->default_target(); + parameters_force_valid_target(); + const Target& target(parameters->target()); - Binary_to_elf binary_to_elf(target->machine_code(), - target->get_size(), - target->is_big_endian(), + Binary_to_elf binary_to_elf(target.machine_code(), + target.get_size(), + target.is_big_endian(), name); if (!binary_to_elf.convert(task)) return false; |