rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-12-28 19:04:27 +03:00
Code Issues Projects Releases Wiki Activity

temporary

Browse Source
This commit is contained in:
Rui Ueyama 2020-10-22 19:35:16 +09:00
parent d5e912f85c
commit ba24d0f872
2 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.cc
View File

@ -101,15 +101,6 @@ static void read_file(std::vector<ObjectFile *> &files, StringRef path) {
}
}
static OutputSection *create_interp_section() {
static char path[] = "/lib64/ld-linux-x86-64.so.2";
ArrayRef<uint8_t> arr((uint8_t *)path, sizeof(path));
auto *osec = new OutputSection(".interp", PF_R, PT_INTERP);
osec->chunks.push_back(new GenericSection(".interp", arr, SHF_ALLOC, SHT_PROGBITS));
return osec;
}
// We want to sort output sections in the following order.
//
// alloc !writable !exec !tls !nobits
@ -240,7 +231,7 @@ int main(int argc, char **argv) {
output_chunks.push_back(out::phdr);
// Add .interp section
output_chunks.push_back(create_interp_section());
output_chunks.push_back(new InterpSection);
// Add other output sections
for (OutputSection *osec : get_output_sections())

57
mold.h
View File

@ -207,26 +207,6 @@ private:
std::string contents;
};
class GenericSection : public InputChunk {
public:
GenericSection(StringRef name, ArrayRef<uint8_t> data,
uint64_t flags, uint32_t type)
: data(data) {
this->name = name;
this->flags = flags;
this->type = type;
}
void copy_to(uint8_t *buf) override {
memcpy(buf + offset, &data[0], data.size());
}
uint64_t get_size() const override { return data.size(); }
private:
ArrayRef<uint8_t> data;
};
std::string toString(InputSection *isec);
inline uint64_t align_to(uint64_t val, uint64_t align) {
@ -241,13 +221,15 @@ inline uint64_t align_to(uint64_t val, uint64_t align) {
class OutputChunk {
public:
virtual void copy_to(uint8_t *buf) = 0;
virtual void relocate(uint8_t *buf) = 0;
virtual void relocate(uint8_t *buf) {}
virtual void set_offset(uint64_t off) { offset = off; }
uint64_t get_offset() const { return offset; }
virtual uint64_t get_size() const = 0;
virtual StringRef get_name() const { return ""; }
virtual const ELF64LE::Shdr *get_shdr() const { return nullptr; }
StringRef name;
ELF64LE::Shdr hdr = {};
protected:
int64_t offset = -1;
int64_t size = -1;
@ -271,8 +253,6 @@ public:
memcpy(buf + offset, &hdr[0], get_size());
}
void relocate(uint8_t *buf) override {}
uint64_t get_size() const override {
return hdr.size() * sizeof(hdr[0]);
}
@ -287,8 +267,6 @@ public:
memcpy(buf + offset, &hdr[0], get_size());
}
void relocate(uint8_t *buf) override {}
uint64_t get_size() const override {
return hdr.size() * sizeof(hdr[0]);
}
@ -301,8 +279,8 @@ class OutputSection : public OutputChunk {
public:
static OutputSection *get_instance(InputSection *isec);
OutputSection(StringRef name, uint64_t flags, uint32_t type)
: name(name) {
OutputSection(StringRef name, uint64_t flags, uint32_t type) {
this->name = name;
hdr.sh_flags = flags;
hdr.sh_type = type;
all_instances.push_back(this);
@ -322,13 +300,9 @@ public:
}
void set_offset(uint64_t off) override;
StringRef get_name() const override { return name; }
const ELF64LE::Shdr *get_shdr() const override { return &hdr; }
std::vector<InputChunk *> chunks;
StringRef name;
ELF64LE::Shdr hdr = {};
static std::vector<OutputSection *> all_instances;
private:
@ -336,6 +310,25 @@ private:
uint64_t on_file_size = -1;
};
class InterpSection : public OutputChunk {
public:
InterpSection() {
name = ".interp";
hdr.sh_flags = llvm::ELF::PF_R;
hdr.sh_type = llvm::ELF::PT_INTERP;
}
void copy_to(uint8_t *buf) override {
memcpy(buf + offset, path, sizeof(path));
}
uint64_t get_size() const override { return sizeof(path); }
private:
static constexpr char path[] = "/lib64/ld-linux-x86-64.so.2";
};
namespace out {
extern OutputEhdr *ehdr;
extern OutputShdr *shdr;