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

temporary

Browse Source
This commit is contained in:
Rui Ueyama 2020-11-17 13:57:53 +09:00
parent dfda92fe9f
commit ba0d7101c4
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.cc
View File

@ -449,15 +449,14 @@ static void write_dynamic_rel(u8 *buf, u8 type, u64 addr, int dynsym_idx, u64 ad
rel->r_addend = addend;
}
static void
write_got_plt(u8 *buf, ArrayRef<ObjectFile *> files) {
static void write_got_plt() {
MyTimer t("write_synthetic", copy_timer);
tbb::parallel_for_each(files, [&](ObjectFile *file) {
u8 *got_buf = buf + out::got->shdr.sh_offset + file->got_offset;
u8 *gotplt_buf = buf + out::gotplt->shdr.sh_offset + file->gotplt_offset;
u8 *plt_buf = buf + out::plt->shdr.sh_offset + file->plt_offset;
u8 *relplt_buf = buf + out::relplt->shdr.sh_offset + file->relplt_offset;
tbb::parallel_for_each(out::files, [&](ObjectFile *file) {
u8 *got_buf = out::buf + out::got->shdr.sh_offset + file->got_offset;
u8 *gotplt_buf = out::buf + out::gotplt->shdr.sh_offset + file->gotplt_offset;
u8 *plt_buf = out::buf + out::plt->shdr.sh_offset + file->plt_offset;
u8 *relplt_buf = out::buf + out::relplt->shdr.sh_offset + file->relplt_offset;
int reldyn_idx = 0;
for (Symbol *sym : file->symbols) {
@ -468,7 +467,7 @@ write_got_plt(u8 *buf, ArrayRef<ObjectFile *> files) {
if (config.is_static) {
*(u64 *)(got_buf + sym->got_idx * GOT_SIZE) = sym->get_addr();
} else {
u8 *reldyn_buf = buf + out::reldyn->shdr.sh_offset + file->reldyn_offset;
u8 *reldyn_buf = out::buf + out::reldyn->shdr.sh_offset + file->reldyn_offset;
write_dynamic_rel(reldyn_buf + reldyn_idx++ * sizeof(ELF64LE::Rela),
R_X86_64_GLOB_DAT, sym->get_got_addr(),
sym->dynsym_idx, 0);
@ -485,7 +484,7 @@ write_got_plt(u8 *buf, ArrayRef<ObjectFile *> files) {
error("unimplemented");
if (sym->plt_idx != -1)
out::plt->write_entry(buf, sym);
out::plt->write_entry(sym);
if (sym->relplt_idx != -1) {
if (sym->type == STT_GNU_IFUNC) {
@ -998,7 +997,7 @@ int main(int argc, char **argv) {
write_symtab(out::buf, files);
// Fill .plt, .got, got.plt, .rela.plt sections
write_got_plt(out::buf, files);
write_got_plt();
// Fill mergeable string sections
write_merged_strings(out::buf, files);

2
mold.h
View File

@ -425,7 +425,7 @@ public:
}
void initialize_buf() override;
void write_entry(u8 *buf, Symbol *sym);
void write_entry(Symbol *sym);
};
class RelPltSection : public OutputChunk {

2
output_chunks.cc
View File

@ -336,7 +336,7 @@ void PltSection::initialize_buf() {
*(u32 *)(base + 8) = out::gotplt->shdr.sh_addr - shdr.sh_addr + 4;
}
void PltSection::write_entry(u8 *buf, Symbol *sym) {
void PltSection::write_entry(Symbol *sym) {
u8 *base = out::buf + shdr.sh_offset + sym->file->plt_offset + sym->plt_idx * PLT_SIZE;
if (sym->got_idx == -1) {