[ELF] Warn changed output section address

When the output section address (addrExpr) is specified, GNU ld warns if
sh_addr is different. This patch implements the warning.

Note, LinkerScript::assignAddresses can be called more than once. We
need to record the changed section addresses, and only report the
warnings after the addresses are finalized.

Reviewed By: grimar

Differential Revision: https://reviews.llvm.org/D74741
This commit is contained in:
Fangrui Song 2020-02-17 13:56:01 -08:00
parent 6ed8e20143
commit de0dda54d3
5 changed files with 30 additions and 2 deletions

View File

@ -839,7 +839,10 @@ void LinkerScript::assignOffsets(OutputSection *sec) {
expandMemoryRegion(ctx->memRegion, dot - ctx->memRegion->curPos,
ctx->memRegion->name, sec->name);
uint64_t oldDot = dot;
switchTo(sec);
if (sec->addrExpr && oldDot != dot)
changedSectionAddresses.push_back({sec, oldDot});
ctx->lmaOffset = 0;
@ -1111,6 +1114,7 @@ const Defined *LinkerScript::assignAddresses() {
auto deleter = std::make_unique<AddressState>();
ctx = deleter.get();
errorOnMissingSection = true;
changedSectionAddresses.clear();
switchTo(aether);
SymbolAssignmentMap oldValues = getSymbolAssignmentValues(sectionCommands);

View File

@ -320,6 +320,10 @@ public:
// Used to implement INSERT [AFTER|BEFORE]. Contains output sections that need
// to be reordered.
std::vector<InsertCommand> insertCommands;
// Sections whose addresses are not equal to their addrExpr values.
std::vector<std::pair<const OutputSection *, uint64_t>>
changedSectionAddresses;
};
extern LinkerScript *script;

View File

@ -1634,6 +1634,17 @@ template <class ELFT> void Writer<ELFT>::finalizeAddressDependentContent() {
}
}
}
// If a SECTIONS command is given, addrExpr, if set, is the specified output
// section address. Warn if the computed value is different from the actual
// address.
if (!script->hasSectionsCommand)
return;
for (auto changed : script->changedSectionAddresses) {
const OutputSection *os = changed.first;
warn("start of section " + os->name + " changes from 0x" +
utohexstr(changed.second) + " to 0x" + utohexstr(os->addr));
}
}
static void finalizeSynthetic(SyntheticSection *sec) {

View File

@ -2,9 +2,12 @@
# RUN: echo '.globl _start; _start: ret; .data.rel.ro; .balign 16; .byte 0; \
# RUN: .data; .balign 32; .byte 0; .bss; .byte 0' | \
# RUN: llvm-mc -filetype=obj -triple=x86_64 - -o %t.o
# RUN: ld.lld -T %s %t.o -o %t
# RUN: ld.lld -T %s %t.o -o %t 2>&1 | FileCheck --check-prefix=WARN %s --implicit-check-not=warning:
# RUN: llvm-readelf -S -l %t | FileCheck %s
# WARN: warning: start of section .data changes from 0x11001 to 0x11010
# WARN: warning: start of section .bss changes from 0x11021 to 0x11040
# CHECK: Name Type Address Off Size ES Flg Lk Inf Al
# CHECK-NEXT: NULL 0000000000000000 000000 000000 00 0 0 0
# CHECK-NEXT: .text PROGBITS 0000000000001000 001000 000001 00 AX 0 0 4

View File

@ -4,9 +4,15 @@
# RUN: echo '.globl _start; _start: ret; .data.rel.ro; .balign 8; .byte 0; .data; .byte 0; \
# RUN: .section .data2,"aw"; .balign 8; .byte 0; .bss; .balign 32; .byte 0' | \
# RUN: llvm-mc -filetype=obj -triple=aarch64 - -o %t.o
# RUN: ld.lld -T %s %t.o -o %t 2>&1 | count 0
# RUN: ld.lld -T %s %t.o -o %t 2>&1 | FileCheck --check-prefix=WARN %s --implicit-check-not=warning:
# RUN: llvm-readelf -S %t | FileCheck %s
## Check we don't warn in the absence of SECTIONS.
# RUN: ld.lld --fatal-warnings -Ttext=0x10000 %t.o -o /dev/null
# WARN: warning: start of section .data.rel.ro changes from 0x10004 to 0x10010
# WARN: warning: start of section .bss changes from 0x20009 to 0x20010
# CHECK: Name Type Address Off Size ES Flg Lk Inf Al
# CHECK-NEXT: NULL 0000000000000000 000000 000000 00 0 0 0
# CHECK-NEXT: .text PROGBITS 0000000000010000 010000 000004 00 AX 0 0 4