rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-12-29 11:24:36 +03:00
Code Issues Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Rui Ueyama 2021-03-30 00:27:44 +09:00
parent 26e22f62ca
commit 453b6679ac
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
object_file.cc
View File

@ -86,7 +86,8 @@ InputFile<E>::InputFile(Context<E> &ctx, MemoryMappedFile<E> *mb)
}
template <typename E>
std::string_view InputFile<E>::get_string(Context<E> &ctx, const ElfShdr<E> &shdr) {
std::string_view
InputFile<E>::get_string(Context<E> &ctx, const ElfShdr<E> &shdr) {
u8 *begin = mb->data(ctx) + shdr.sh_offset;
u8 *end = begin + shdr.sh_size;
if (mb->data(ctx) + mb->size() < end)
@ -304,7 +305,8 @@ void ObjectFile<E>::read_ehframe(Context<E> &ctx, InputSection<E> &isec) {
std::vector<EhReloc<E>> eh_rels;
while (!rels.empty() && rels[0].r_offset < end_offset) {
if (id && first_global <= rels[0].r_sym)
Fatal(ctx) << isec << ": FDE with non-local relocations is not supported";
Fatal(ctx) << isec
<< ": FDE with non-local relocations is not supported";
Symbol<E> &sym = *this->symbols[rels[0].r_sym];
eh_rels.push_back(EhReloc<E>{sym, rels[0].r_type,
@ -481,7 +483,8 @@ static size_t find_null(std::string_view data, u64 entsize) {
//
// We do not support mergeable sections that have relocations.
template <typename E>
static MergeableSection<E> split_section(Context<E> &ctx, InputSection<E> &sec) {
static MergeableSection<E>
split_section(Context<E> &ctx, InputSection<E> &sec) {
MergeableSection<E> rec;
MergedSection<E> *parent =
@ -750,8 +753,9 @@ void ObjectFile<E>::resolve_regular_symbols(Context<E> &ctx) {
}
template <typename E>
void ObjectFile<E>::mark_live_objects(Context<E> &ctx,
std::function<void(ObjectFile<E> *)> feeder) {
void
ObjectFile<E>::mark_live_objects(Context<E> &ctx,
std::function<void(ObjectFile<E> *)> feeder) {
assert(this->is_alive);
for (i64 i = first_global; i < this->symbols.size(); i++) {
@ -972,7 +976,7 @@ void ObjectFile<E>::write_symtab(Context<E> &ctx) {
auto write_sym = [&](i64 i) {
Symbol<E> &sym = *this->symbols[i];
ElfSym<E> &esym = *(ElfSym<E> *)(symtab_base + symtab_off);
symtab_off += sizeof(ElfSym<E>);
symtab_off += sizeof(esym);
esym = elf_syms[i];
esym.st_name = strtab_off;
@ -1112,7 +1116,8 @@ void SharedFile<E>::parse(Context<E> &ctx) {
// Read a symbol table.
i64 first_global = symtab_sec->sh_info;
std::span<ElfSym<E>> esyms = this->template get_data<ElfSym<E>>(ctx, *symtab_sec);
std::span<ElfSym<E>> esyms =
this->template get_data<ElfSym<E>>(ctx, *symtab_sec);
std::span<u16> vers;
if (ElfShdr<E> *sec = this->find_section(SHT_GNU_VERSYM))

3
output_chunks.cc
View File

@ -245,7 +245,8 @@ void RelDynSection<E>::sort(Context<E> &ctx) {
Timer t("sort_dynamic_relocs");
ElfRela<E> *begin = (ElfRela<E> *)(ctx.buf + this->shdr.sh_offset);
ElfRela<E> *end = (ElfRela<E> *)(ctx.buf + this->shdr.sh_offset + this->shdr.sh_size);
ElfRela<E> *end =
(ElfRela<E> *)(ctx.buf + this->shdr.sh_offset + this->shdr.sh_size);
tbb::parallel_sort(begin, end, [](const ElfRela<E> &a, const ElfRela<E> &b) {
return std::tuple(a.r_sym, a.r_offset) <