intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-13 11:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BOLT] More refactoring of PHDR handling. NFC (#148932)

Browse Source 
Replace ad-hoc adjustment of the program header count with info from the
new segment list.
This commit is contained in:
Maksim Panchenko
2025-07-24 11:47:27 -07:00
committed by GitHub
parent 47b5917348
commit d5d94ba8bc
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bolt/lib/Rewrite/RewriteInstance.cpp
View File

@@ -4260,32 +4260,26 @@ void RewriteInstance::patchELFPHDRTable() {
const ELFFile<ELF64LE> &Obj = ELF64LEFile->getELFFile();
raw_fd_ostream &OS = Out->os();
// Write/re-write program headers.
Phnum = Obj.getHeader().e_phnum;
if (PHDRTableOffset) {
// Writing new pheader table and adding one new entry for R+X segment.
Phnum += 1;
if (NewWritableSegmentSize) {
// Adding one more entry for R+W segment.
Phnum += 1;
}
} else {
assert(!PHDRTableAddress && "unexpected address for program header table");
PHDRTableOffset = Obj.getHeader().e_phoff;
if (NewWritableSegmentSize) {
BC->errs() << "BOLT-ERROR: unable to add writable segment\n";
exit(1);
}
}
if (opts::Instrument)
Phnum += 2;
if (BC->NewSegments.empty()) {
BC->outs() << "BOLT-INFO: not adding new segments\n";
return;
}
if (opts::UseGnuStack) {
assert(!PHDRTableAddress && "unexpected address for program header table");
if (BC->NewSegments.size() > 1) {
BC->errs() << "BOLT-ERROR: unable to add writable segment\n";
exit(1);
}
} else {
Phnum += BC->NewSegments.size();
}
if (!PHDRTableOffset)
PHDRTableOffset = Obj.getHeader().e_phoff;
const uint64_t SavedPos = OS.tell();
OS.seek(PHDRTableOffset);