forked from Imagelibrary/binutils-gdb
* 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.
This commit is contained in:
@@ -29,6 +29,8 @@ namespace gold
|
||||
class General_options;
|
||||
class Errors;
|
||||
class Target;
|
||||
template<int size, bool big_endian>
|
||||
class Sized_target;
|
||||
|
||||
// Here we define the Parameters class which simply holds simple
|
||||
// general parameters which apply to the entire link. We use a global
|
||||
@@ -61,7 +63,7 @@ class Parameters
|
||||
set_options(const General_options* options);
|
||||
|
||||
void
|
||||
set_target(const Target* target);
|
||||
set_target(Target* target);
|
||||
|
||||
void
|
||||
set_doing_static_link(bool doing_static_link);
|
||||
@@ -98,10 +100,20 @@ class Parameters
|
||||
return *this->target_;
|
||||
}
|
||||
|
||||
// When we don't have an output file to associate a target, make a
|
||||
// default one, with guesses about size and endianness.
|
||||
const Target&
|
||||
default_target() const;
|
||||
// The Sized_target of the output file. The caller must request the
|
||||
// right size and endianness.
|
||||
template<int size, bool big_endian>
|
||||
Sized_target<size, big_endian>*
|
||||
sized_target() const
|
||||
{
|
||||
gold_assert(this->target_valid());
|
||||
return static_cast<Sized_target<size, big_endian>*>(this->target_);
|
||||
}
|
||||
|
||||
// Clear the target, for testing.
|
||||
void
|
||||
clear_target()
|
||||
{ this->target_ = NULL; }
|
||||
|
||||
// Return true if TARGET is compatible with the current target.
|
||||
bool
|
||||
@@ -140,7 +152,7 @@ class Parameters
|
||||
private:
|
||||
Errors* errors_;
|
||||
const General_options* options_;
|
||||
const Target* target_;
|
||||
Target* target_;
|
||||
bool doing_static_link_valid_;
|
||||
bool doing_static_link_;
|
||||
int debug_;
|
||||
@@ -159,11 +171,22 @@ extern void
|
||||
set_parameters_options(const General_options* options);
|
||||
|
||||
extern void
|
||||
set_parameters_target(const Target* target);
|
||||
set_parameters_target(Target* target);
|
||||
|
||||
extern void
|
||||
set_parameters_doing_static_link(bool doing_static_link);
|
||||
|
||||
|
||||
// Ensure that the target to be valid by using the default target if
|
||||
// necessary.
|
||||
|
||||
extern void
|
||||
parameters_force_valid_target();
|
||||
|
||||
// Clear the current target, for testing.
|
||||
|
||||
extern void
|
||||
parameters_clear_target();
|
||||
|
||||
// Return whether we are doing a particular debugging type. The
|
||||
// argument is one of the flags from debug.h.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user