From 029ba973354c8eb02c476d3ba8c7f555344afdce Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 30 Sep 2009 22:21:13 +0000 Subject: * 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. --- gold/testsuite/binary_unittest.cc | 16 ++++++++++------ gold/testsuite/object_unittest.cc | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 17 deletions(-) (limited to 'gold/testsuite') diff --git a/gold/testsuite/binary_unittest.cc b/gold/testsuite/binary_unittest.cc index 2645e0b..b2e14df 100644 --- a/gold/testsuite/binary_unittest.cc +++ b/gold/testsuite/binary_unittest.cc @@ -44,8 +44,9 @@ using namespace gold; template bool -Sized_binary_test(Target* target) +Sized_binary_test() { + parameters_clear_target(); // We need a pretend Task. const Task* task = reinterpret_cast(-1); @@ -73,7 +74,6 @@ Sized_binary_test(Target* target) return false; CHECK(!object->is_dynamic()); - CHECK(object->target() == target); CHECK(object->shnum() == 5); CHECK(object->section_name(1) == ".data"); CHECK(object->section_flags(1) == (elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE)); @@ -125,23 +125,27 @@ Binary_test(Test_report*) int fail = 0; #ifdef HAVE_TARGET_32_LITTLE - if (!Sized_binary_test<32, false>(target_test_pointer_32_little)) + if (!Sized_binary_test<32, false>()) ++fail; + CHECK(¶meters->target() == target_test_pointer_32_little); #endif #ifdef HAVE_TARGET_32_BIG - if (!Sized_binary_test<32, true>(target_test_pointer_32_big)) + if (!Sized_binary_test<32, true>()) ++fail; + CHECK(¶meters->target() == target_test_pointer_32_big); #endif #ifdef HAVE_TARGET_64_LITTLE - if (!Sized_binary_test<64, false>(target_test_pointer_64_little)) + if (!Sized_binary_test<64, false>()) ++fail; + CHECK(¶meters->target() == target_test_pointer_64_little); #endif #ifdef HAVE_TARGET_64_BIG - if (!Sized_binary_test<64, true>(target_test_pointer_64_big)) + if (!Sized_binary_test<64, true>()) ++fail; + CHECK(¶meters->target() == target_test_pointer_64_big); #endif return fail == 0; diff --git a/gold/testsuite/object_unittest.cc b/gold/testsuite/object_unittest.cc index b36997e..0451add 100644 --- a/gold/testsuite/object_unittest.cc +++ b/gold/testsuite/object_unittest.cc @@ -36,9 +36,9 @@ using namespace gold; template bool -Sized_object_test(const unsigned char* test_file, unsigned int test_file_size, - Target* target_test_pointer) +Sized_object_test(const unsigned char* test_file, unsigned int test_file_size) { + parameters_clear_target(); // We need a pretend Task. const Task* task = reinterpret_cast(-1); Input_file input_file(task, "test.o", test_file, test_file_size); @@ -46,7 +46,6 @@ Sized_object_test(const unsigned char* test_file, unsigned int test_file_size, test_file, test_file_size, NULL); CHECK(object->name() == "test.o"); CHECK(!object->is_dynamic()); - CHECK(object->target() == target_test_pointer); CHECK(object->is_locked()); object->unlock(task); CHECK(!object->is_locked()); @@ -67,30 +66,30 @@ Object_test(Test_report*) #ifdef HAVE_TARGET_32_LITTLE if (!Sized_object_test<32, false>(test_file_1_32_little, - test_file_1_size_32_little, - target_test_pointer_32_little)) + test_file_1_size_32_little)) ++fail; + CHECK(¶meters->target() == target_test_pointer_32_little); #endif #ifdef HAVE_TARGET_32_BIG if (!Sized_object_test<32, true>(test_file_1_32_big, - test_file_1_size_32_big, - target_test_pointer_32_big)) + test_file_1_size_32_big)) ++fail; + CHECK(¶meters->target() == target_test_pointer_32_big); #endif #ifdef HAVE_TARGET_64_LITTLE if (!Sized_object_test<64, false>(test_file_1_64_little, - test_file_1_size_64_little, - target_test_pointer_64_little)) + test_file_1_size_64_little)) ++fail; + CHECK(¶meters->target() == target_test_pointer_64_little); #endif #ifdef HAVE_TARGET_64_BIG if (!Sized_object_test<64, true>(test_file_1_64_big, - test_file_1_size_64_big, - target_test_pointer_64_big)) + test_file_1_size_64_big)) ++fail; + CHECK(¶meters->target() == target_test_pointer_64_big); #endif return fail == 0; -- cgit v1.1