// incremental.cc -- incremental linking test/debug tool
-// Copyright 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2009-2016 Free Software Foundation, Inc.
// Written by Rafael Avila de Espindola <rafael.espindola@gmail.com>
// This file is part of gold.
unsigned int* symndx)
{
typedef Incremental_inputs_reader<size, big_endian> Inputs_reader;
+ static const unsigned int global_sym_entry_size =
+ Incremental_inputs_reader<size, big_endian>::global_sym_entry_size;
+
for (unsigned int i = 0; i < incremental_inputs.input_file_count(); ++i)
{
typename Inputs_reader::Incremental_input_entry_reader input_file =
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))
+ / global_sym_entry_size);
return input_file;
}
}
Incremental_inputs_reader<size, big_endian>
incremental_inputs(inc->inputs_reader());
- if (incremental_inputs.version() != 1)
+ if (incremental_inputs.version() != 2)
{
fprintf(stderr, "%s: %s: unknown incremental version %d\n", argv0,
filename, incremental_inputs.version());
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());
+ printf(" COMDAT group count: %d\n",
+ input_file.get_comdat_group_count());
break;
case INCREMENTAL_INPUT_ARCHIVE:
printf("Archive\n");
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;
{
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<long long>(info.sh_offset),
static_cast<long long>(info.sh_size),
info.name);
}
- }
-
- 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);
- }
+ unsigned int ncomdat = input_file.get_comdat_group_count();
+ for (unsigned int i = 0; i < ncomdat; ++i)
+ printf(" Comdat group: %s\n",
+ input_file.get_comdat_group_signature(i));
}
// Get a view of the .symtab section.
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;
+ bool is_copy;
+ unsigned int output_symndx =
+ input_file.get_output_symbol_index(symndx, &is_def, &is_copy);
+ sym_p = symtab_view.data() + output_symndx * sym_size;
+ elfcpp::Sym<size, big_endian> sym(sym_p);
+ const char* symname;
+ if (!strtab.get_c_string(sym.get_st_name(), &symname))
+ symname = "<unknown>";
+ printf(" %6d %6s %8s %8s %8s %8s %-5s %s\n",
+ output_symndx,
+ "", "", "", "", "",
+ is_copy ? "COPY" : (is_def ? "DEF" : "UNDEF"),
+ symname);
+ }
+ }
+ else
+ {
+ for (unsigned int symndx = 0; symndx < nsyms; ++symndx)
+ {
+ Incremental_global_symbol_reader<big_endian> 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<size, big_endian> sym(sym_p);
+ const char* symname;
+ if (!strtab.get_c_string(sym.get_st_name(), &symname))
+ symname = "<unknown>";
+ printf(" %6d %6d %8d %8d %8d %8d %-5s %s\n",
+ output_symndx,
+ info.shndx() == -1U ? -1 : info.shndx(),
+ input_file.get_symbol_offset(symndx),
+ info.next_offset(),
+ info.reloc_count(),
+ info.reloc_offset(),
+ (info.shndx() == -1U
+ ? "BASE"
+ : info.shndx() == 0 ? "UNDEF" : "DEF"),
+ symname);
+ }
+ }
+ }
+
+ sym_p = symtab_view.data() + first_global * sym_size;
printf("\nGlobal symbol table:\n");
for (unsigned int i = 0; i < nglobals; i++)
{
Entry_reader input_file =
find_input_containing_global<size, big_endian>(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<big_endian> 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),
symname);
r_off += irelocs.reloc_size;
}
- offset = sym_info.next_offset;
+ offset = sym_info.next_offset();
}
sym_p += sym_size;
}
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<size, big_endian> sym(sym_p);
const char* symname;
if (!strtab.get_c_string(sym.get_st_name(), &symname))
symname = "<unknown>";
- printf("global %s (%d)", symname, got_desc);
+ printf("global %s (%d)", symname, got_symndx);
}
printf("\n");
}
Output_file* file = new Output_file(filename);
- bool t = file->open_for_modification();
+ bool t = file->open_base_file(NULL, false);
if (!t)
{
- fprintf(stderr, "%s: open_for_modification(%s): %s\n", argv[0], filename,
+ fprintf(stderr, "%s: open_base_file(%s): %s\n", argv[0], filename,
strerror(errno));
return 1;
}