@@ -3978,8 +3978,8 @@ void RewriteInstance::patchELFPHDRTable() {
3978
3978
NewPhdr.p_filesz = sizeof (NewPhdr) * Phnum;
3979
3979
NewPhdr.p_memsz = sizeof (NewPhdr) * Phnum;
3980
3980
} else if (Phdr.p_type == ELF::PT_GNU_EH_FRAME) {
3981
- ErrorOr<BinarySection &> EHFrameHdrSec =
3982
- BC-> getUniqueSectionByName ( getNewSecPrefix () + " .eh_frame_hdr " );
3981
+ ErrorOr<BinarySection &> EHFrameHdrSec = BC-> getUniqueSectionByName (
3982
+ getNewSecPrefix () + getEHFrameHdrSectionName () );
3983
3983
if (EHFrameHdrSec && EHFrameHdrSec->isAllocatable () &&
3984
3984
EHFrameHdrSec->isFinalized ()) {
3985
3985
NewPhdr.p_offset = EHFrameHdrSec->getOutputFileOffset ();
@@ -5692,7 +5692,8 @@ void RewriteInstance::writeEHFrameHeader() {
5692
5692
BC->AsmInfo ->getCodePointerSize ()));
5693
5693
check_error (std::move (Er), " failed to parse EH frame" );
5694
5694
5695
- LLVM_DEBUG (dbgs () << " BOLT: writing a new .eh_frame_hdr\n " );
5695
+ LLVM_DEBUG (dbgs () << " BOLT: writing a new " << getEHFrameHdrSectionName ()
5696
+ << ' \n ' );
5696
5697
5697
5698
NextAvailableAddress =
5698
5699
appendPadding (Out->os (), NextAvailableAddress, EHFrameHdrAlign);
@@ -5710,16 +5711,17 @@ void RewriteInstance::writeEHFrameHeader() {
5710
5711
const unsigned Flags = BinarySection::getFlags (/* IsReadOnly=*/ true ,
5711
5712
/* IsText=*/ false ,
5712
5713
/* IsAllocatable=*/ true );
5713
- BinarySection *OldEHFrameHdrSection = getSection (" .eh_frame_hdr " );
5714
+ BinarySection *OldEHFrameHdrSection = getSection (getEHFrameHdrSectionName () );
5714
5715
if (OldEHFrameHdrSection)
5715
- OldEHFrameHdrSection->setOutputName (getOrgSecPrefix () + " .eh_frame_hdr" );
5716
+ OldEHFrameHdrSection->setOutputName (getOrgSecPrefix () +
5717
+ getEHFrameHdrSectionName ());
5716
5718
5717
5719
BinarySection &EHFrameHdrSec = BC->registerOrUpdateSection (
5718
- getNewSecPrefix () + " .eh_frame_hdr " , ELF::SHT_PROGBITS, Flags, nullptr ,
5719
- NewEHFrameHdr.size (), /* Alignment=*/ 1 );
5720
+ getNewSecPrefix () + getEHFrameHdrSectionName () , ELF::SHT_PROGBITS, Flags,
5721
+ nullptr , NewEHFrameHdr.size (), /* Alignment=*/ 1 );
5720
5722
EHFrameHdrSec.setOutputFileOffset (EHFrameHdrFileOffset);
5721
5723
EHFrameHdrSec.setOutputAddress (EHFrameHdrOutputAddress);
5722
- EHFrameHdrSec.setOutputName (" .eh_frame_hdr " );
5724
+ EHFrameHdrSec.setOutputName (getEHFrameHdrSectionName () );
5723
5725
5724
5726
NextAvailableAddress += EHFrameHdrSec.getOutputSize ();
5725
5727
0 commit comments