X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gold%2Fincremental-dump.cc;h=1887db86cac6c30837f3854736bbb8dc193e85a9;hb=0f1c85a62235edfbe68c78b197dcdbbe94b0b160;hp=6f79f4d5ff123ef48706e6220d2e046f1af200a8;hpb=b961d0d7b65a2bdfd465f774db948c199fddaa06;p=platform%2Fupstream%2Fbinutils.git diff --git a/gold/incremental-dump.cc b/gold/incremental-dump.cc index 6f79f4d..1887db8 100644 --- a/gold/incremental-dump.cc +++ b/gold/incremental-dump.cc @@ -63,7 +63,7 @@ find_input_containing_global( if (offset >= input_file.get_symbol_offset(0) && offset < input_file.get_symbol_offset(nsyms)) { - *symndx = (offset - input_file.get_symbol_offset(0)) / 16; + *symndx = (offset - input_file.get_symbol_offset(0)) / 20; return input_file; } } @@ -129,23 +129,30 @@ dump_incremental_inputs(const char* argv0, const char* filename, mtime.nanoseconds, ctime(&mtime.seconds)); + printf(" Serial Number: %d\n", input_file.arg_serial()); + printf(" In System Directory: %s\n", + input_file.is_in_system_directory() ? "true" : "false"); + Incremental_input_type input_type = input_file.type(); printf(" Type: "); switch (input_type) { case INCREMENTAL_INPUT_OBJECT: - printf("Object\n"); - printf(" Input section count: %d\n", - input_file.get_input_section_count()); - printf(" Symbol count: %d\n", - input_file.get_global_symbol_count()); - break; case INCREMENTAL_INPUT_ARCHIVE_MEMBER: - printf("Archive member\n"); + printf("%s\n", (input_type == INCREMENTAL_INPUT_OBJECT + ? "Object" : "Archive member")); printf(" Input section count: %d\n", input_file.get_input_section_count()); - printf(" Symbol count: %d\n", + printf(" Global symbol count: %d\n", input_file.get_global_symbol_count()); + printf(" Local symbol offset: %d\n", + input_file.get_local_symbol_offset()); + printf(" Local symbol count: %d\n", + input_file.get_local_symbol_count()); + printf(" First dynamic reloc: %d\n", + input_file.get_first_dyn_reloc()); + printf(" Dynamic reloc count: %d\n", + input_file.get_dyn_reloc_count()); break; case INCREMENTAL_INPUT_ARCHIVE: printf("Archive\n"); @@ -155,6 +162,10 @@ dump_incremental_inputs(const char* argv0, const char* filename, break; case INCREMENTAL_INPUT_SHARED_LIBRARY: printf("Shared library\n"); + printf(" As needed: %s\n", + input_file.as_needed() ? "true" : "false"); + printf(" soname: %s\n", + input_file.get_soname()); printf(" Symbol count: %d\n", input_file.get_global_symbol_count()); break; @@ -195,7 +206,7 @@ dump_incremental_inputs(const char* argv0, const char* filename, { typename Entry_reader::Input_section_info info( input_file.get_input_section(shndx)); - printf(" %3d %6d %8lld %8lld %s\n", shndx, + printf(" %3d %6d %8lld %8lld %s\n", shndx + 1, info.output_shndx, static_cast(info.sh_offset), static_cast(info.sh_size), @@ -203,42 +214,6 @@ dump_incremental_inputs(const char* argv0, const char* filename, } } - printf("\nGlobal symbols per input file:\n"); - for (unsigned int i = 0; i < incremental_inputs.input_file_count(); ++i) - { - Entry_reader input_file(incremental_inputs.input_file(i)); - - if (input_file.type() != INCREMENTAL_INPUT_OBJECT - && input_file.type() != INCREMENTAL_INPUT_ARCHIVE_MEMBER) - continue; - - const char* objname = input_file.filename(); - if (objname == NULL) - { - fprintf(stderr,"%s: %s: failed to get file name for object %u\n", - argv0, filename, i); - exit(1); - } - - printf("[%d] %s\n", i, objname); - - unsigned int nsyms = input_file.get_global_symbol_count(); - if (nsyms > 0) - printf(" %6s %8s %8s %8s %8s\n", - "outndx", "offset", "chain", "#relocs", "rbase"); - for (unsigned int symndx = 0; symndx < nsyms; ++symndx) - { - typename Entry_reader::Global_symbol_info info( - input_file.get_global_symbol_info(symndx)); - printf(" %6d %8d %8d %8d %8d\n", - info.output_symndx, - input_file.get_symbol_offset(symndx), - info.next_offset, - info.reloc_count, - info.reloc_offset); - } - } - // Get a view of the .symtab section. elfcpp::Elf_file elf_file(inc); @@ -280,8 +255,77 @@ dump_incremental_inputs(const char* argv0, const char* filename, unsigned int nsyms = symtab_location.data_size / sym_size; unsigned int nglobals = isymtab.symbol_count(); unsigned int first_global = nsyms - nglobals; - unsigned const char* sym_p = symtab_view.data() + first_global * sym_size; + unsigned const char* sym_p; + printf("\nGlobal symbols per input file:\n"); + for (unsigned int i = 0; i < incremental_inputs.input_file_count(); ++i) + { + Entry_reader input_file(incremental_inputs.input_file(i)); + + if (input_file.type() != INCREMENTAL_INPUT_OBJECT + && input_file.type() != INCREMENTAL_INPUT_ARCHIVE_MEMBER + && input_file.type() != INCREMENTAL_INPUT_SHARED_LIBRARY) + continue; + + const char* objname = input_file.filename(); + if (objname == NULL) + { + fprintf(stderr,"%s: %s: failed to get file name for object %u\n", + argv0, filename, i); + exit(1); + } + + printf("[%d] %s\n", i, objname); + + unsigned int nsyms = input_file.get_global_symbol_count(); + if (nsyms > 0) + printf(" %6s %6s %8s %8s %8s %8s\n", + "outndx", "shndx", "offset", "chain", "#relocs", "rbase"); + if (input_file.type() == INCREMENTAL_INPUT_SHARED_LIBRARY) + { + for (unsigned int symndx = 0; symndx < nsyms; ++symndx) + { + bool is_def; + unsigned int output_symndx = + input_file.get_output_symbol_index(symndx, &is_def); + sym_p = symtab_view.data() + output_symndx * sym_size; + elfcpp::Sym sym(sym_p); + const char* symname; + if (!strtab.get_c_string(sym.get_st_name(), &symname)) + symname = ""; + printf(" %6d %6s %8s %8s %8s %8s %-5s %s\n", + output_symndx, + "", "", "", "", "", + is_def ? "DEF" : "UNDEF", + symname); + } + } + else + { + for (unsigned int symndx = 0; symndx < nsyms; ++symndx) + { + Incremental_global_symbol_reader info( + input_file.get_global_symbol_reader(symndx)); + unsigned int output_symndx = info.output_symndx(); + sym_p = symtab_view.data() + output_symndx * sym_size; + elfcpp::Sym sym(sym_p); + const char* symname; + if (!strtab.get_c_string(sym.get_st_name(), &symname)) + symname = ""; + printf(" %6d %6d %8d %8d %8d %8d %-5s %s\n", + output_symndx, + info.shndx(), + input_file.get_symbol_offset(symndx), + info.next_offset(), + info.reloc_count(), + info.reloc_offset(), + info.shndx() != elfcpp::SHN_UNDEF ? "DEF" : "UNDEF", + symname); + } + } + } + + sym_p = symtab_view.data() + first_global * sym_size; printf("\nGlobal symbol table:\n"); for (unsigned int i = 0; i < nglobals; i++) { @@ -297,19 +341,19 @@ dump_incremental_inputs(const char* argv0, const char* filename, Entry_reader input_file = find_input_containing_global(incremental_inputs, offset, &sym_ndx); - typename Entry_reader::Global_symbol_info sym_info( - input_file.get_global_symbol_info(sym_ndx)); + Incremental_global_symbol_reader sym_info( + input_file.get_global_symbol_reader(sym_ndx)); printf(" %s (first reloc: %d, reloc count: %d)", - input_file.filename(), sym_info.reloc_offset, - sym_info.reloc_count); - if (sym_info.output_symndx != first_global + i) - printf(" ** wrong output symndx (%d) **", sym_info.output_symndx); + input_file.filename(), sym_info.reloc_offset(), + sym_info.reloc_count()); + if (sym_info.output_symndx() != first_global + i) + printf(" ** wrong output symndx (%d) **", sym_info.output_symndx()); printf("\n"); // Dump the relocations from this input file for this symbol. - unsigned int r_off = sym_info.reloc_offset; - for (unsigned int j = 0; j < sym_info.reloc_count; j++) + unsigned int r_off = sym_info.reloc_offset(); + for (unsigned int j = 0; j < sym_info.reloc_count(); j++) { - printf(" %4d relocation type %3d shndx %d" + printf(" %4d relocation type %3d shndx %2d" " offset %016llx addend %016llx %s\n", r_off, irelocs.get_r_type(r_off), @@ -319,7 +363,7 @@ dump_incremental_inputs(const char* argv0, const char* filename, symname); r_off += irelocs.reloc_size; } - offset = sym_info.next_offset; + offset = sym_info.next_offset(); } sym_p += sym_size; } @@ -332,24 +376,26 @@ dump_incremental_inputs(const char* argv0, const char* filename, for (unsigned int i = 0; i < ngot; ++i) { unsigned int got_type = igot_plt.get_got_type(i); - unsigned int got_desc = igot_plt.get_got_desc(i); + unsigned int got_symndx = igot_plt.get_got_symndx(i); + unsigned int got_input_index = igot_plt.get_got_input_index(i); printf("[%d] type %02x, ", i, got_type & 0x7f); - if (got_type == 0x7f) + if ((got_type & 0x7f) == 0x7f) printf("reserved"); else if (got_type & 0x80) { - Entry_reader input_file = incremental_inputs.input_file(got_desc); + Entry_reader input_file = + incremental_inputs.input_file(got_input_index); const char* objname = input_file.filename(); - printf("local: %s (%d)", objname, got_desc); + printf("local: %s (%d)", objname, got_symndx); } else { - sym_p = symtab_view.data() + got_desc * sym_size; + sym_p = symtab_view.data() + got_symndx * sym_size; elfcpp::Sym sym(sym_p); const char* symname; if (!strtab.get_c_string(sym.get_st_name(), &symname)) symname = ""; - printf("global %s (%d)", symname, got_desc); + printf("global %s (%d)", symname, got_symndx); } printf("\n"); }