From dc3714f31f5b15f9c078dcf7ddaa705dacd313c0 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 10 Mar 2013 23:08:18 +0000 Subject: * gold.cc (queue_middle_tasks): Move detect_odr_violations.. * layout.cc (Layout_task_runner::run): ..to here. * symtab.h (struct Symbol_location): Extract from.. (class Symbol_table): ..here. * symtab.cc (Symbol_table::linenos_from_loc): Invoke function_location. * target.h (class Target): Add function_location and do_function_location functions. (class Sized_target): Add do_function_location. * object.h (class Sized_relobj_file): Move find_shdr.. (class Object): ..to here. * object.cc: Likewise. Update to suit. Instantiate. (Sized_relobj_file::find_eh_frame): Update find_shdr call. * powerpc.cc (class Powerpc_dynobj): New. (Target_powerpc::do_function_location): New function. (Powerpc_relobj::do_find_special_sections): Update find_shdr call. (Powerpc_dynobj::do_read_symbols): New function. (Target_powerpc::do_make_elf_object): Make a Powerpc_dynobj. --- gold/symtab.h | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'gold/symtab.h') diff --git a/gold/symtab.h b/gold/symtab.h index f26d4b9e71d..040be954312 100644 --- a/gold/symtab.h +++ b/gold/symtab.h @@ -1180,6 +1180,25 @@ struct Define_symbol_in_segment bool only_if_ref; }; +// Specify an object/section/offset location. Used by ODR code. + +struct Symbol_location +{ + // Object where the symbol is defined. + Object* object; + // Section-in-object where the symbol is defined. + unsigned int shndx; + // For relocatable objects, offset-in-section where the symbol is defined. + // For dynamic objects, address where the symbol is defined. + off_t offset; + bool operator==(const Symbol_location& that) const + { + return (this->object == that.object + && this->shndx == that.shndx + && this->offset == that.offset); + } +}; + // This class manages warnings. Warnings are a GNU extension. When // we see a section named .gnu.warning.SYM in an object file, and if // we wind using the definition of SYM from that object file, then we @@ -1599,19 +1618,6 @@ class Symbol_table // the locations the symbols is (weakly) defined (and certain other // conditions are met). This map will be used later to detect // possible One Definition Rule (ODR) violations. - struct Symbol_location - { - Object* object; // Object where the symbol is defined. - unsigned int shndx; // Section-in-object where the symbol is defined. - off_t offset; // Offset-in-section where the symbol is defined. - bool operator==(const Symbol_location& that) const - { - return (this->object == that.object - && this->shndx == that.shndx - && this->offset == that.offset); - } - }; - struct Symbol_location_hash { size_t operator()(const Symbol_location& loc) const -- cgit v1.2.1