forked from OSchip/llvm-project
Don't put an orphan before the first . assignment.
This is an horrible special case, but seems to match bfd's behaviour and is important for avoiding placing an orphan section before the expected start of the file. llvm-svn: 287994
This commit is contained in:
parent
2f5cb60b07
commit
7fe4ec9b3a
|
@ -632,13 +632,21 @@ template <class ELFT> void LinkerScript<ELFT>::adjustSectionsAfterSorting() {
|
|||
// /* The RW PT_LOAD starts here*/
|
||||
// rw_sec : { *(rw_sec) }
|
||||
// would mean that the RW PT_LOAD would become unaligned.
|
||||
static bool shouldSkip(const BaseCommand &Cmd) {
|
||||
static bool shouldSkip(int CmdIndex) {
|
||||
auto CmdIter = ScriptConfig->Commands.begin() + CmdIndex;
|
||||
const BaseCommand &Cmd = **CmdIter;
|
||||
if (isa<OutputSectionCommand>(Cmd))
|
||||
return false;
|
||||
const auto *Assign = dyn_cast<SymbolAssignment>(&Cmd);
|
||||
if (!Assign)
|
||||
return true;
|
||||
return Assign->Name != ".";
|
||||
if (Assign->Name != ".")
|
||||
return true;
|
||||
// As a horrible special case, skip a . assignment if it is the first thing in
|
||||
// the script. We do this because it is common to set a load address by
|
||||
// starting the script with ". = 0xabcd" and the expectation is that every
|
||||
// section is after that.
|
||||
return CmdIndex == 0;
|
||||
}
|
||||
|
||||
// Orphan sections are sections present in the input files which are not
|
||||
|
@ -657,7 +665,7 @@ void LinkerScript<ELFT>::placeOrphanSections() {
|
|||
// correct result.
|
||||
auto CmdIter = Opt.Commands.begin() + CmdIndex;
|
||||
auto E = Opt.Commands.end();
|
||||
while (CmdIter != E && shouldSkip(**CmdIter)) {
|
||||
while (CmdIter != E && shouldSkip(CmdIndex)) {
|
||||
++CmdIter;
|
||||
++CmdIndex;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
# REQUIRES: x86
|
||||
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
|
||||
# RUN: echo "SECTIONS { \
|
||||
# RUN: . = 0x1000; \
|
||||
# RUN: . = 0x2000; \
|
||||
# RUN: .bar : { . = . + 1; } \
|
||||
# RUN: }" > %t.script
|
||||
# RUN: ld.lld -o %t -T %t.script %t.o -shared
|
||||
# RUN: llvm-readobj -s %t | FileCheck %s
|
||||
|
||||
# CHECK: Name: .text
|
||||
# CHECK-NEXT: Type: SHT_PROGBITS
|
||||
# CHECK-NEXT: Flags [
|
||||
# CHECK-NEXT: SHF_ALLOC
|
||||
# CHECK-NEXT: SHF_EXECINSTR
|
||||
# CHECK-NEXT: ]
|
||||
# CHECK-NEXT: Address: 0x1000
|
Loading…
Reference in New Issue