Skip to content

Commit 8b2f332

Browse files
committed
[ELF] Make some diagnostics follow the convention
1 parent 62af3eb commit 8b2f332

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lld/ELF/Arch/X86_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ void X86_64::relaxGot(uint8_t *loc, const Relocation &rel, uint64_t val) const {
947947
bool X86_64::adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
948948
uint8_t stOther) const {
949949
if (!config->is64) {
950-
error("Target doesn't support split stacks.");
950+
error("target doesn't support split stacks");
951951
return false;
952952
}
953953

lld/ELF/InputSection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ static Relocation *getRISCVPCRelHi20(const Symbol *sym, uint64_t addend) {
586586
InputSection *isec = cast<InputSection>(d->section);
587587

588588
if (addend != 0)
589-
warn("Non-zero addend in R_RISCV_PCREL_LO12 relocation to " +
589+
warn("non-zero addend in R_RISCV_PCREL_LO12 relocation to " +
590590
isec->getObjMsg(d->value) + " is ignored");
591591

592592
// Relocations are sorted by offset, so we can use std::equal_range to do
@@ -1136,7 +1136,7 @@ static void switchMorestackCallsToMorestackNonSplit(
11361136
// __morestack_non_split.
11371137
Symbol *moreStackNonSplit = symtab->find("__morestack_non_split");
11381138
if (!moreStackNonSplit) {
1139-
error("Mixing split-stack objects requires a definition of "
1139+
error("mixing split-stack objects requires a definition of "
11401140
"__morestack_non_split");
11411141
return;
11421142
}

lld/test/ELF/x86-64-split-stack-prologue-adjust-fail.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RELOCATABLE: cannot mix split-stack and non-split-stack in a relocatable link
1313

1414
# RUN: not ld.lld --defsym __morestack=0x100 --defsym _start=0x300 %t1.o %t2.o %t3.o -o /dev/null 2>&1 | FileCheck %s -check-prefix=ERROR
15-
# ERROR: Mixing split-stack objects requires a definition of __morestack_non_split
15+
# ERROR: mixing split-stack objects requires a definition of __morestack_non_split
1616

1717
.text
1818

0 commit comments

Comments
 (0)