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:
@@ -688,13 +688,12 @@ Symbol_table::force_local(Symbol* sym)
|
||||
// option was used.
|
||||
|
||||
const char*
|
||||
Symbol_table::wrap_symbol(Object* object, const char* name,
|
||||
Stringpool::Key* name_key)
|
||||
Symbol_table::wrap_symbol(const char* name, Stringpool::Key* name_key)
|
||||
{
|
||||
// For some targets, we need to ignore a specific character when
|
||||
// wrapping, and add it back later.
|
||||
char prefix = '\0';
|
||||
if (name[0] == object->target()->wrap_char())
|
||||
if (name[0] == parameters->target().wrap_char())
|
||||
{
|
||||
prefix = name[0];
|
||||
++name;
|
||||
@@ -864,7 +863,7 @@ Symbol_table::add_from_object(Object* object,
|
||||
if (orig_st_shndx == elfcpp::SHN_UNDEF
|
||||
&& parameters->options().any_wrap())
|
||||
{
|
||||
const char* wrap_name = this->wrap_symbol(object, name, &name_key);
|
||||
const char* wrap_name = this->wrap_symbol(name, &name_key);
|
||||
if (wrap_name != name)
|
||||
{
|
||||
// If we see a reference to malloc with version GLIBC_2.0,
|
||||
@@ -945,7 +944,7 @@ Symbol_table::add_from_object(Object* object,
|
||||
was_common = false;
|
||||
|
||||
Sized_target<size, big_endian>* target =
|
||||
object->sized_target<size, big_endian>();
|
||||
parameters->sized_target<size, big_endian>();
|
||||
if (!target->has_make_symbol())
|
||||
ret = new Sized_symbol<size>();
|
||||
else
|
||||
@@ -1033,7 +1032,6 @@ Symbol_table::add_from_relobj(
|
||||
{
|
||||
*defined = 0;
|
||||
|
||||
gold_assert(size == relobj->target()->get_size());
|
||||
gold_assert(size == parameters->target().get_size());
|
||||
|
||||
const int sym_size = elfcpp::Elf_sizes<size>::sym_size;
|
||||
@@ -1272,7 +1270,6 @@ Symbol_table::add_from_dynobj(
|
||||
{
|
||||
*defined = 0;
|
||||
|
||||
gold_assert(size == dynobj->target()->get_size());
|
||||
gold_assert(size == parameters->target().get_size());
|
||||
|
||||
if (dynobj->just_symbols())
|
||||
@@ -1661,11 +1658,8 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion,
|
||||
sym = new Sized_symbol<size>();
|
||||
else
|
||||
{
|
||||
gold_assert(target.get_size() == size);
|
||||
gold_assert(target.is_big_endian() ? big_endian : !big_endian);
|
||||
typedef Sized_target<size, big_endian> My_target;
|
||||
const My_target* sized_target =
|
||||
static_cast<const My_target*>(&target);
|
||||
Sized_target<size, big_endian>* sized_target =
|
||||
parameters->sized_target<size, big_endian>();
|
||||
sym = sized_target->make_symbol();
|
||||
if (sym == NULL)
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user