X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fresolve.cc;h=a425dc9c30d4ff3b796a56e15cc917f5291b8015;hb=f3c469b95b9f1f635668660c5041df9513a47a02;hp=7c2260680072c84da5b803a785adff889fd2508f;hpb=565ed01a4e0e3584f24580177822a5271b1c0c8b;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/resolve.cc b/gold/resolve.cc index 7c22606800..a425dc9c30 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -1,6 +1,6 @@ // resolve.cc -- symbol resolution for gold -// Copyright (C) 2006-2017 Free Software Foundation, Inc. +// Copyright (C) 2006-2020 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -92,9 +92,9 @@ Symbol::override_base(const elfcpp::Sym& sym, Object* object, const char* version) { gold_assert(this->source_ == FROM_OBJECT); - this->u_.from_object.object = object; + this->u1_.object = object; this->override_version(version); - this->u_.from_object.shndx = st_shndx; + this->u2_.shndx = st_shndx; this->is_ordinary_shndx_ = is_ordinary; // Don't override st_type from plugin placeholder symbols. if (object->pluginobj() == NULL) @@ -247,18 +247,28 @@ Symbol_table::resolve(Sized_symbol* to, Object* object, const char* version, bool is_default_version) { + bool to_is_ordinary; + const unsigned int to_shndx = to->shndx(&to_is_ordinary); + // It's possible for a symbol to be defined in an object file // using .symver to give it a version, and for there to also be // a linker script giving that symbol the same version. We // don't want to give a multiple-definition error for this // harmless redefinition. - bool to_is_ordinary; if (to->source() == Symbol::FROM_OBJECT && to->object() == object - && is_ordinary && to->is_defined() - && to->shndx(&to_is_ordinary) == st_shndx + && is_ordinary && to_is_ordinary + && to_shndx == st_shndx + && to->value() == sym.get_st_value()) + return; + + // Likewise for an absolute symbol defined twice with the same value. + if (!is_ordinary + && st_shndx == elfcpp::SHN_ABS + && !to_is_ordinary + && to_shndx == elfcpp::SHN_ABS && to->value() == sym.get_st_value()) return; @@ -350,8 +360,8 @@ Symbol_table::resolve(Sized_symbol* to, && (sym.get_st_bind() == elfcpp::STB_WEAK || to->binding() == elfcpp::STB_WEAK) && orig_st_shndx != elfcpp::SHN_UNDEF - && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF && to_is_ordinary + && to_shndx != elfcpp::SHN_UNDEF && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. && to->symsize() != 0 && (sym.get_st_type() != to->type() @@ -362,7 +372,7 @@ Symbol_table::resolve(Sized_symbol* to, { Symbol_location fromloc = { object, orig_st_shndx, static_cast(sym.get_st_value()) }; - Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), + Symbol_location toloc = { to->object(), to_shndx, static_cast(to->value()) }; this->candidate_odr_violations_[to->name()].insert(fromloc); this->candidate_odr_violations_[to->name()].insert(toloc); @@ -384,7 +394,7 @@ Symbol_table::resolve(Sized_symbol* to, object, &adjust_common_sizes, &adjust_dyndef, is_default_version)) { - elfcpp::STB tobinding = to->binding(); + elfcpp::STB orig_tobinding = to->binding(); typename Sized_symbol::Value_type tovalue = to->value(); this->override(to, sym, st_shndx, is_ordinary, object, version); if (adjust_common_sizes) @@ -398,7 +408,7 @@ Symbol_table::resolve(Sized_symbol* to, { // We are overriding an UNDEF or WEAK UNDEF with a DYN DEF. // Remember which kind of UNDEF it was for future reference. - to->set_undef_binding(tobinding); + to->set_undef_binding(orig_tobinding); } } else @@ -421,6 +431,11 @@ Symbol_table::resolve(Sized_symbol* to, to->override_visibility(sym.get_st_visibility()); } + // If we have a non-WEAK reference from a regular object to a + // dynamic object, mark the dynamic object as needed. + if (to->is_from_dynobj() && to->in_reg() && !to->is_undef_binding_weak()) + to->object()->set_is_needed(); + if (adjust_common_sizes && parameters->options().warn_common()) { if (tosize > sym.get_st_size()) @@ -611,6 +626,13 @@ Symbol_table::should_override(const Symbol* to, unsigned int frombits, && to->version() == NULL && is_default_version) return true; + // Or, if the existing definition is in an unused --as-needed library, + // and the reference is weak, let the new definition override. + if (to->in_reg() + && to->is_undef_binding_weak() + && to->object()->as_needed() + && !to->object()->is_needed()) + return true; return false; case UNDEF * 16 + DYN_DEF: @@ -627,16 +649,12 @@ Symbol_table::should_override(const Symbol* to, unsigned int frombits, case COMMON * 16 + DYN_DEF: case WEAK_COMMON * 16 + DYN_DEF: - case DYN_COMMON * 16 + DYN_DEF: - case DYN_WEAK_COMMON * 16 + DYN_DEF: // Ignore a dynamic definition if we already have a common // definition. return false; case DEF * 16 + DYN_WEAK_DEF: case WEAK_DEF * 16 + DYN_WEAK_DEF: - case DYN_DEF * 16 + DYN_WEAK_DEF: - case DYN_WEAK_DEF * 16 + DYN_WEAK_DEF: // Ignore a weak dynamic definition if we already have a // definition. return false; @@ -660,12 +678,25 @@ Symbol_table::should_override(const Symbol* to, unsigned int frombits, case COMMON * 16 + DYN_WEAK_DEF: case WEAK_COMMON * 16 + DYN_WEAK_DEF: - case DYN_COMMON * 16 + DYN_WEAK_DEF: - case DYN_WEAK_COMMON * 16 + DYN_WEAK_DEF: // Ignore a weak dynamic definition if we already have a common // definition. return false; + case DYN_COMMON * 16 + DYN_DEF: + case DYN_WEAK_COMMON * 16 + DYN_DEF: + case DYN_DEF * 16 + DYN_WEAK_DEF: + case DYN_WEAK_DEF * 16 + DYN_WEAK_DEF: + case DYN_COMMON * 16 + DYN_WEAK_DEF: + case DYN_WEAK_COMMON * 16 + DYN_WEAK_DEF: + // If the existing definition is in an unused --as-needed library, + // and the reference is weak, let a new dynamic definition override. + if (to->in_reg() + && to->is_undef_binding_weak() + && to->object()->as_needed() + && !to->object()->is_needed()) + return true; + return false; + case DEF * 16 + UNDEF: case WEAK_DEF * 16 + UNDEF: case UNDEF * 16 + UNDEF: @@ -917,6 +948,61 @@ Symbol_table::report_resolve_problem(bool is_error, const char* msg, gold_info("%s: %s: previous definition here", program_name, objname); } +// Completely override existing symbol. Everything bar name_, +// version_, and is_forced_local_ flag are copied. version_ is +// cleared if from->version_ is clear. Returns true if this symbol +// should be forced local. +bool +Symbol::clone(const Symbol* from) +{ + // Don't allow cloning after dynamic linking info is attached to symbols. + // We aren't prepared to merge such. + gold_assert(!this->has_symtab_index() && !from->has_symtab_index()); + gold_assert(!this->has_dynsym_index() && !from->has_dynsym_index()); + gold_assert(this->got_offset_list() == NULL + && from->got_offset_list() == NULL); + gold_assert(!this->has_plt_offset() && !from->has_plt_offset()); + + if (!from->version_) + this->version_ = from->version_; + this->u1_ = from->u1_; + this->u2_ = from->u2_; + this->type_ = from->type_; + this->binding_ = from->binding_; + this->visibility_ = from->visibility_; + this->nonvis_ = from->nonvis_; + this->source_ = from->source_; + this->is_def_ = from->is_def_; + this->is_forwarder_ = from->is_forwarder_; + this->has_alias_ = from->has_alias_; + this->needs_dynsym_entry_ = from->needs_dynsym_entry_; + this->in_reg_ = from->in_reg_; + this->in_dyn_ = from->in_dyn_; + this->needs_dynsym_value_ = from->needs_dynsym_value_; + this->has_warning_ = from->has_warning_; + this->is_copied_from_dynobj_ = from->is_copied_from_dynobj_; + this->is_ordinary_shndx_ = from->is_ordinary_shndx_; + this->in_real_elf_ = from->in_real_elf_; + this->is_defined_in_discarded_section_ + = from->is_defined_in_discarded_section_; + this->undef_binding_set_ = from->undef_binding_set_; + this->undef_binding_weak_ = from->undef_binding_weak_; + this->is_predefined_ = from->is_predefined_; + this->is_protected_ = from->is_protected_; + this->non_zero_localentry_ = from->non_zero_localentry_; + + return !this->is_forced_local_ && from->is_forced_local_; +} + +template +bool +Sized_symbol::clone(const Sized_symbol* from) +{ + this->value_ = from->value_; + this->symsize_ = from->symsize_; + return Symbol::clone(from); +} + // A special case of should_override which is only called for a strong // defined symbol from a regular object file. This is used when // defining special symbols. @@ -952,13 +1038,10 @@ Symbol::override_base_with_special(const Symbol* from) switch (from->source_) { case FROM_OBJECT: - this->u_.from_object = from->u_.from_object; - break; case IN_OUTPUT_DATA: - this->u_.in_output_data = from->u_.in_output_data; - break; case IN_OUTPUT_SEGMENT: - this->u_.in_output_segment = from->u_.in_output_segment; + this->u1_ = from->u1_; + this->u2_ = from->u2_; break; case IS_CONSTANT: case IS_UNDEFINED: @@ -1119,4 +1202,11 @@ Symbol_table::override_with_special<64>(Sized_symbol<64>*, const Sized_symbol<64>*); #endif +template +bool +Sized_symbol<32>::clone(const Sized_symbol<32>*); + +template +bool +Sized_symbol<64>::clone(const Sized_symbol<64>*); } // End namespace gold.