This is an archive of the discontinued LLVM Phabricator instance.

Differential D53645

Include input section name and output section name in an error message.
ClosedPublic

Authored by ruiu on Oct 24 2018, 7:00 AM.

Details

Reviewers
ivanlozano
• espindola
Commits
rGaa2948776a89: Include input section name and output section name in an error message.
rLLD345172: Include input section name and output section name in an error message.
rL345172: Include input section name and output section name in an error message.
Summary

Include input section name and output section name in an error message.

Diff Detail

Event Timeline

ruiu created this revision.Oct 24 2018, 7:00 AM
Herald added a reviewer: • espindola. · View Herald TranscriptOct 24 2018, 7:00 AM
Herald added subscribers: arichardson, emaste. · View Herald Transcript
Harbormaster completed remote builds in B24149: Diff 170877.Oct 24 2018, 7:00 AM
ruiu updated this revision to Diff 170887.Oct 24 2018, 7:40 AM
  • rebase
Harbormaster completed remote builds in B24151: Diff 170887.Oct 24 2018, 7:40 AM
ivanlozano accepted this revision.Oct 24 2018, 11:15 AM
This revision is now accepted and ready to land.Oct 24 2018, 11:15 AM
Closed by commit rL345172: Include input section name and output section name in an error message. (authored by ruiu). · Explain WhyOct 24 2018, 11:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
ELF/
4 lines
test/
ELF/
2 lines

Diff 170877

lld/ELF/Writer.cpp

Show First 20 Lines • Show All 1,655 Lines • ▼ Show 20 Linestemplate <class ELFT> void Writer<ELFT>::finalizeSections() {
// Ensure data sections are not mixed with executable sections when // Ensure data sections are not mixed with executable sections when
// -execute-only is used. // -execute-only is used.
if (Config->ExecuteOnly) if (Config->ExecuteOnly)
for (OutputSection *OS : OutputSections) for (OutputSection *OS : OutputSections)
if (OS->Flags & SHF_EXECINSTR) if (OS->Flags & SHF_EXECINSTR)
for (InputSection *IS : getInputSections(OS)) for (InputSection *IS : getInputSections(OS))
if (!(IS->Flags & SHF_EXECINSTR)) if (!(IS->Flags & SHF_EXECINSTR))
error("-execute-only does not support intermingling data and code"); error(
"cannot place " + toString(IS) + " into " + toString(OS->Name) +
": -execute-only does not support intermingling data and code");
// Prefer command line supplied address over other constraints. // Prefer command line supplied address over other constraints.
for (OutputSection *Sec : OutputSections) { for (OutputSection *Sec : OutputSections) {
auto I = Config->SectionStartMap.find(Sec->Name); auto I = Config->SectionStartMap.find(Sec->Name);
if (I != Config->SectionStartMap.end()) if (I != Config->SectionStartMap.end())
Sec->AddrExpr = [=] { return I->second; }; Sec->AddrExpr = [=] { return I->second; };
} }
▲ Show 20 Lines • Show All 784 Lines • Show Last 20 Lines

lld/test/ELF/execute-only-mixed-data.s

Show All 10 Lines
// RUN: echo "SECTIONS \ // RUN: echo "SECTIONS \
// RUN: { \ // RUN: { \
// RUN: .text : { *(.text) } \ // RUN: .text : { *(.text) } \
// RUN: .rodata : { *(.rodata.bar) *(.rodata.foo) } \ // RUN: .rodata : { *(.rodata.bar) *(.rodata.foo) } \
// RUN: }" > %t.lds // RUN: }" > %t.lds
// RUN: ld.lld -T%t.lds %t.o -o %t -execute-only 2>&1 // RUN: ld.lld -T%t.lds %t.o -o %t -execute-only 2>&1
// CHECK: -execute-only does not support intermingling data and code // CHECK: cannot place {{.*}}:(.rodata.foo) into .text: -execute-only does not support intermingling data and code
br lr br lr
.section .rodata.foo .section .rodata.foo
.word 0x1 .word 0x1
.section .rodata.bar .section .rodata.bar
.word 0x2 .word 0x2