Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lld/ELF/Writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1531,8 +1531,7 @@ template <class ELFT> void Writer<ELFT>::finalizeAddressDependentContent() {
// With Thunk Size much smaller than branch range we expect to
// converge quickly; if we get to 30 something has gone wrong.
if (changed && pass >= 30) {
Err(ctx) << (ctx.target->needsThunks ? "thunk creation not converged"
: "relaxation not converged");
Err(ctx) << "address assignment did not converge";
break;
}

Expand Down
2 changes: 1 addition & 1 deletion lld/test/ELF/linkerscript/symbol-assign-many-passes2.test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## arm-thunk-many-passes.s is worst case case of thunk generation that takes 9
## passes to converge. It takes a few more passes to make symbol assignment
## converge. Test that
## 1. we don't error that "thunk creation not converged".
## 1. we don't error that "address assignment did not converge".
## 2. we check convergence of symbols defined in an output section descriptor.

# CHECK: 01011050 T a
Expand Down
Loading