rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-12-25 17:34:02 +03:00
Code Issues Projects Releases Wiki Activity

temporary

Browse Source
This commit is contained in:
Rui Ueyama 2020-11-04 14:03:01 +09:00
parent 350f1eaaf5
commit 9f28568fe0
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
main.cc
View File

@ -729,25 +729,24 @@ int main(int argc, char **argv) {
// Fix linker-synthesized symbol addresses.
{
auto assign = [&](OutputChunk *chunk, Symbol *start, Symbol *end = nullptr) {
start->input_section = chunk->sections[0];
if (end) {
end->input_section = chunk->sections[0];
end->addr = chunk->shdr.sh_size;
auto start = [&](OutputChunk *chunk, Symbol *sym) {
if (sym) {
sym->output_chunk = chunk;
sym->addr = chunk->shdr.sh_addr;
}
};
auto assign_end = [&](Symbol *sym, OutputChunk *chunk) {
auto stop = [&](OutputChunk *chunk, Symbol *sym) {
if (sym) {
sym->input_section = chunk->sections[0];
sym->addr = chunk->shdr.sh_size;
sym->output_chunk = chunk;
sym->addr = chunk->shdr.sh_addr + chunk->shdr.sh_size;
}
};
// __bss_start
for (OutputChunk *chunk : output_chunks) {
if (chunk->name == ".bss" && !chunk->sections.empty()) {
assign(chunk, out::__bss_start);
start(chunk, out::__bss_start);
break;
}
}
@ -755,24 +754,26 @@ int main(int argc, char **argv) {
// __ehdr_start
for (OutputChunk *chunk : output_chunks) {
if (chunk->shndx == 1) {
out::__ehdr_start->input_section = chunk->sections[0];
out::__ehdr_start->output_chunk = chunk;
out::__ehdr_start->addr = out::ehdr->shdr.sh_addr - chunk->shdr.sh_addr;
break;
}
}
// __rela_iplt_start and __rela_iplt_end
out::__rela_iplt_start->addr = out::relplt->shdr.sh_addr;
out::__rela_iplt_end->addr = out::relplt->shdr.sh_addr + out::relplt->shdr.sh_size;
start(out::relplt, out::__rela_iplt_start);
stop(out::relplt, out::__rela_iplt_end);
// __{init,fini}_array_{start,end}
for (OutputChunk *chunk : output_chunks) {
switch (chunk->shdr.sh_type) {
case SHT_INIT_ARRAY:
assign(chunk, out::__init_array_start, out::__init_array_end);
start(chunk, out::__init_array_start);
stop(chunk, out::__init_array_end);
break;
case SHT_FINI_ARRAY:
assign(chunk, out::__fini_array_start, out::__fini_array_end);
start(chunk, out::__fini_array_start);
stop(chunk, out::__fini_array_end);
break;
}
}
@ -783,18 +784,18 @@ int main(int argc, char **argv) {
continue;
if (chunk->shdr.sh_flags & SHF_ALLOC) {
assign_end(out::end, chunk);
assign_end(out::_end, chunk);
stop(chunk, out::end);
stop(chunk, out::_end);
}
if (chunk->shdr.sh_flags & SHF_EXECINSTR) {
assign_end(out::etext, chunk);
assign_end(out::_etext, chunk);
stop(chunk, out::etext);
stop(chunk, out::_etext);
}
if (chunk->shdr.sh_type != SHT_NOBITS && chunk->shdr.sh_flags & SHF_ALLOC) {
assign_end(out::edata, chunk);
assign_end(out::_edata, chunk);
stop(chunk, out::edata);
stop(chunk, out::_edata);
}
}
@ -803,9 +804,8 @@ int main(int argc, char **argv) {
if (!is_c_identifier(chunk->name))
continue;
Symbol *start = Symbol::intern(("__start_" + chunk->name).str());
Symbol *stop = Symbol::intern(("__stop_" + chunk->name).str());
assign(chunk, start, stop);
start(chunk, Symbol::intern(("__start_" + chunk->name).str()));
stop(chunk, Symbol::intern(("__stop_" + chunk->name).str()));
}
}

2
mold.h
View File

@ -48,6 +48,7 @@ using llvm::object::ELFFile;
class Symbol;
class InputSection;
class ObjectFile;
class OutputChunk;
class OutputSection;
struct Config {
@ -159,6 +160,7 @@ public:
StringRef name;
ObjectFile *file = nullptr;
InputSection *input_section = nullptr;
OutputChunk *output_chunk = nullptr;
u64 addr = 0;
uint32_t got_offset = 0;

9
object_file.cc
View File

@ -397,8 +397,13 @@ void ObjectFile::write_symtab(u8 *buf, u64 symtab_off, u64 strtab_off,
esym.st_value = sym.addr;
esym.st_size = elf_syms[i].st_size;
esym.st_info = elf_syms[i].st_info;
esym.st_shndx = sym.input_section
? sym.input_section->output_section->shndx : SHN_ABS;
if (sym.input_section)
esym.st_shndx = sym.input_section->output_section->shndx;
else if (sym.output_chunk)
esym.st_shndx = sym.output_chunk->shndx;
else
esym.st_shndx = SHN_ABS;
symtab_off += sizeof(ELF64LE::Sym);