X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gold%2Fdynobj.h;h=be0d975b251235e5f6e25a90126ad387e97245f3;hb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;hp=aea004d3f76411f6c08ebf2d5f54dda9734c9b2d;hpb=f7e2ee482013bd5df3e3726305eab7c5ed5ce020;p=platform%2Fupstream%2Fbinutils.git diff --git a/gold/dynobj.h b/gold/dynobj.h index aea004d..be0d975 100644 --- a/gold/dynobj.h +++ b/gold/dynobj.h @@ -1,6 +1,6 @@ // dynobj.h -- dynamic object support for gold -*- C++ -*- -// Copyright 2006, 2007 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -31,7 +31,7 @@ namespace gold { -class General_options; +class Version_script_info; // A dynamic object (ET_DYN). This is an abstract base class itself. // The implementations is the template class Sized_dynobj. @@ -39,13 +39,38 @@ class General_options; class Dynobj : public Object { public: - Dynobj(const std::string& name, Input_file* input_file, off_t offset = 0) - : Object(name, input_file, true, offset), soname_() - { } + // We keep a list of all the DT_NEEDED entries we find. + typedef std::vector Needed; + + Dynobj(const std::string& name, Input_file* input_file, off_t offset = 0); // Return the name to use in a DT_NEEDED entry for this object. const char* - soname() const; + soname() const + { return this->soname_.c_str(); } + + // Return the list of DT_NEEDED strings. + const Needed& + needed() const + { return this->needed_; } + + // Return whether this dynamic object has any DT_NEEDED entries + // which were not seen during the link. + bool + has_unknown_needed_entries() const + { + gold_assert(this->unknown_needed_ != UNKNOWN_NEEDED_UNSET); + return this->unknown_needed_ == UNKNOWN_NEEDED_TRUE; + } + + // Set whether this dynamic object has any DT_NEEDED entries which + // were not seen during the link. + void + set_has_unknown_needed_entries(bool set) + { + gold_assert(this->unknown_needed_ == UNKNOWN_NEEDED_UNSET); + this->unknown_needed_ = set ? UNKNOWN_NEEDED_TRUE : UNKNOWN_NEEDED_FALSE; + } // Compute the ELF hash code for a string. static uint32_t @@ -76,6 +101,11 @@ class Dynobj : public Object set_soname_string(const char* s) { this->soname_.assign(s); } + // Add an entry to the list of DT_NEEDED strings. + void + add_needed(const char* s) + { this->needed_.push_back(std::string(s)); } + private: // Compute the GNU hash code for a string. static uint32_t @@ -103,8 +133,21 @@ class Dynobj : public Object unsigned char** pphash, unsigned int* phashlen); + // Values for the has_unknown_needed_entries_ field. + enum Unknown_needed + { + UNKNOWN_NEEDED_UNSET, + UNKNOWN_NEEDED_TRUE, + UNKNOWN_NEEDED_FALSE + }; + // The DT_SONAME name, if any. std::string soname_; + // The list of DT_NEEDED entries. + Needed needed_; + // Whether this dynamic object has any DT_NEEDED entries not seen + // during the link. + Unknown_needed unknown_needed_; }; // A dynamic object, size and endian specific version. @@ -113,12 +156,14 @@ template class Sized_dynobj : public Dynobj { public: + typedef typename Sized_relobj::Symbols Symbols; + Sized_dynobj(const std::string& name, Input_file* input_file, off_t offset, const typename elfcpp::Ehdr&); - // Set up the object file based on the ELF header. + // Set up the object file based on TARGET. void - setup(const typename elfcpp::Ehdr&); + setup(); // Read the symbols. void @@ -130,7 +175,12 @@ class Sized_dynobj : public Dynobj // Add the symbols to the symbol table. void - do_add_symbols(Symbol_table*, Read_symbols_data*); + do_add_symbols(Symbol_table*, Read_symbols_data*, Layout*); + + // Get the size of a section. + uint64_t + do_section_size(unsigned int shndx) + { return this->elf_file_.section_size(shndx); } // Get the name of a section. std::string @@ -148,11 +198,44 @@ class Sized_dynobj : public Dynobj do_section_flags(unsigned int shndx) { return this->elf_file_.section_flags(shndx); } + // Not used for dynobj. + uint64_t + do_section_entsize(unsigned int ) + { gold_unreachable(); } + + // Return section address. + uint64_t + do_section_address(unsigned int shndx) + { return this->elf_file_.section_addr(shndx); } + + // Return section type. + unsigned int + do_section_type(unsigned int shndx) + { return this->elf_file_.section_type(shndx); } + // Return the section link field. unsigned int do_section_link(unsigned int shndx) { return this->elf_file_.section_link(shndx); } + // Return the section link field. + unsigned int + do_section_info(unsigned int shndx) + { return this->elf_file_.section_info(shndx); } + + // Return the section alignment. + uint64_t + do_section_addralign(unsigned int shndx) + { return this->elf_file_.section_addralign(shndx); } + + // Return the Xindex structure to use. + Xindex* + do_initialize_xindex(); + + // Get symbol counts. + void + do_get_global_symbol_counts(const Symbol_table*, size_t*, size_t*) const; + private: // For convenience. typedef Sized_dynobj This; @@ -162,11 +245,19 @@ class Sized_dynobj : public Dynobj typedef elfcpp::Shdr Shdr; typedef elfcpp::Dyn Dyn; + // Adjust a section index if necessary. + unsigned int + adjust_shndx(unsigned int shndx) + { + if (shndx >= elfcpp::SHN_LORESERVE) + shndx += this->elf_file_.large_shndx_offset(); + return shndx; + } + // Find the dynamic symbol table and the version sections, given the // section headers. void find_dynsym_sections(const unsigned char* pshdrs, - unsigned int* pdynshm_shndx, unsigned int* pversym_shndx, unsigned int* pverdef_shndx, unsigned int* pverneed_shndx, @@ -176,15 +267,14 @@ class Sized_dynobj : public Dynobj void read_dynsym_section(const unsigned char* pshdrs, unsigned int shndx, elfcpp::SHT type, unsigned int link, - File_view** view, off_t* view_size, + File_view** view, section_size_type* view_size, unsigned int* view_info); - // Set the SONAME from the SHT_DYNAMIC section at DYNAMIC_SHNDX. - // The STRTAB parameters may have the relevant string table. + // Read the dynamic tags. void - set_soname(const unsigned char* pshdrs, unsigned int dynamic_shndx, - unsigned int strtab_shndx, const unsigned char* strtabu, - off_t strtab_size); + read_dynamic(const unsigned char* pshdrs, unsigned int dynamic_shndx, + unsigned int strtab_shndx, const unsigned char* strtabu, + off_t strtab_size); // Mapping from version number to version name. typedef std::vector Version_map; @@ -207,6 +297,13 @@ class Sized_dynobj : public Dynobj // General access to the ELF file. elfcpp::Elf_file elf_file_; + // The section index of the dynamic symbol table. + unsigned int dynsym_shndx_; + // The entries in the symbol table for the symbols. We only keep + // this if we need it to print symbol information. + Symbols* symbols_; + // Number of defined symbols. + size_t defined_count_; }; // A base class for Verdef and Verneed_version which just handles the @@ -233,10 +330,10 @@ class Version_base // Set the version index. void - set_index(unsigned int index) + set_index(unsigned int vindex) { gold_assert(this->index_ == -1U); - this->index_ = index; + this->index_ = vindex; } // Clear the weak flag in a version definition. @@ -257,9 +354,10 @@ class Version_base class Verdef : public Version_base { public: - Verdef(const char* name, bool is_base, bool is_weak, bool is_symbol_created) - : name_(name), deps_(), is_base_(is_base), is_weak_(is_weak), - is_symbol_created_(is_symbol_created) + Verdef(const char* vname, const std::vector& deps, + bool is_base, bool vis_weak, bool vis_symbol_created) + : name_(vname), deps_(deps), is_base_(is_base), is_weak_(vis_weak), + is_symbol_created_(vis_symbol_created) { } // Return the version name. @@ -275,8 +373,8 @@ class Verdef : public Version_base // Add a dependency to this version. The NAME should be // canonicalized in the dynamic Stringpool. void - add_dependency(const char* name) - { this->deps_.push_back(name); } + add_dependency(const char* dname) + { this->deps_.push_back(dname); } // Return whether this definition is weak. bool @@ -297,8 +395,7 @@ class Verdef : public Version_base // Write contents to buffer. template unsigned char* - write(const Stringpool*, bool is_last, unsigned char* - ACCEPT_SIZE_ENDIAN) const; + write(const Stringpool*, bool is_last, unsigned char*) const; private: Verdef(const Verdef&); @@ -306,7 +403,7 @@ class Verdef : public Version_base // The type of the list of version dependencies. Each dependency // should be canonicalized in the dynamic Stringpool. - typedef std::vector Deps; + typedef std::vector Deps; // The name of this version. This should be canonicalized in the // dynamic Stringpool. @@ -327,8 +424,8 @@ class Verdef : public Version_base class Verneed_version : public Version_base { public: - Verneed_version(const char* version) - : version_(version) + Verneed_version(const char* ver) + : version_(ver) { } // Return the version name. @@ -353,8 +450,8 @@ class Verneed_version : public Version_base class Verneed { public: - Verneed(const char* filename) - : filename_(filename), need_versions_() + Verneed(const char* fname) + : filename_(fname), need_versions_() { } ~Verneed(); @@ -383,8 +480,7 @@ class Verneed // Write contents to buffer. template unsigned char* - write(const Stringpool*, bool is_last, unsigned char* - ACCEPT_SIZE_ENDIAN) const; + write(const Stringpool*, bool is_last, unsigned char*) const; private: Verneed(const Verneed&); @@ -407,9 +503,7 @@ class Verneed class Versions { public: - Versions() - : defs_(), needs_(), version_table_(), is_finalized_(false) - { } + Versions(const Version_script_info&, Stringpool*); ~Versions(); @@ -422,7 +516,7 @@ class Versions // for the next dynamic symbol. We add new dynamic symbols to SYMS // and return an updated DYNSYM_INDEX. unsigned int - finalize(const Target*, Symbol_table* symtab, unsigned int dynsym_index, + finalize(Symbol_table* symtab, unsigned int dynsym_index, std::vector* syms); // Return whether there are any version definitions. @@ -442,26 +536,30 @@ class Versions symbol_section_contents(const Symbol_table*, const Stringpool*, unsigned int local_symcount, const std::vector& syms, - unsigned char**, unsigned int* - ACCEPT_SIZE_ENDIAN) const; + unsigned char**, unsigned int*) const; // Build an allocated buffer holding the contents of the version // definition section (.gnu.version_d). template void def_section_contents(const Stringpool*, unsigned char**, - unsigned int* psize, unsigned int* pentries - ACCEPT_SIZE_ENDIAN) const; + unsigned int* psize, unsigned int* pentries) const; // Build an allocated buffer holding the contents of the version // reference section (.gnu.version_r). template void need_section_contents(const Stringpool*, unsigned char**, - unsigned int* psize, unsigned int* pentries - ACCEPT_SIZE_ENDIAN) const; + unsigned int* psize, unsigned int* pentries) const; + + const Version_script_info& + version_script() const + { return this->version_script_; } private: + Versions(const Versions&); + Versions& operator=(const Versions&); + // The type of the list of version definitions. typedef std::vector Defs; @@ -486,6 +584,10 @@ class Versions version_index(const Symbol_table*, const Stringpool*, const Symbol* sym) const; + // Define the base version of a shared library. + void + define_base_version(Stringpool* dynpool); + // We keep a hash table mapping canonicalized name/version pairs to // a version base. typedef std::pair Key; @@ -516,6 +618,11 @@ class Versions Version_table version_table_; // Whether the version indexes have been set. bool is_finalized_; + // Contents of --version-script, if passed, or NULL. + const Version_script_info& version_script_; + // Whether we need to insert a base version. This is only used for + // shared libaries and is cleared when the base version is defined. + bool needs_base_version_; }; } // End namespace gold.