[lld] 151b53d - [ELF] Remove -z sort-thunks (#213074)

[via llvm-commits]

Author: Fangrui Song
Date: 2026-07-30T19:49:37-07:00
New Revision: 151b53deb836f82fdc068f05d4af1b42e1c4748a

URL: https://github.com/llvm/llvm-project/commit/151b53deb836f82fdc068f05d4af1b42e1c4748a
DIFF: https://github.com/llvm/llvm-project/commit/151b53deb836f82fdc068f05d4af1b42e1c4748a.diff

LOG: [ELF] Remove -z sort-thunks (#213074)

The option was added by #211721 (sort forward thunks by descending
destination to prevent convergence failures) as a temporary opt-out.
Tests have been migrated to the default order.

Added: 
    

Modified: 
    lld/ELF/Config.h
    lld/ELF/Driver.cpp
    lld/ELF/Relocations.cpp
    lld/test/ELF/aarch64-thunk-sort.s

Removed: 
    


################################################################################
diff  --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index bd74699eda235..1426aab12758f 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -452,7 +452,6 @@ struct Config {
   bool zRodynamic;
   bool zSectionHeader;
   bool zShstk;
-  bool zSortThunks;
   bool zStartStopGC;
   uint8_t zStartStopVisibility;
   bool zText;

diff  --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 314c6c06995d8..3f51d4edaba5c 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -1679,7 +1679,6 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
   ctx.arg.zRodynamic = hasZOption(args, "rodynamic");
   ctx.arg.zSeparate = getZSeparate(args);
   ctx.arg.zShstk = hasZOption(args, "shstk");
-  ctx.arg.zSortThunks = getZFlag(args, "sort-thunks", "nosort-thunks", true);
   ctx.arg.zStackSize = args::getZOptionValue(args, OPT_z, "stack-size", 0);
   ctx.arg.zStartStopGC =
       getZFlag(args, "start-stop-gc", "nostart-stop-gc", true);

diff  --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index b99fc4555b7f1..4addf28bbffac 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1970,7 +1970,7 @@ bool ThunkCreator::createThunks(uint32_t pass,
 
         for (auto &p : isd->thunkSections) {
           // Sort in pass 0, which creates most thunks.
-          if (pass == 0 && ctx.arg.zSortThunks)
+          if (pass == 0)
             p.first->sortByDestination();
           addressesChanged |= p.first->assignOffsets();
         }

diff  --git a/lld/test/ELF/aarch64-thunk-sort.s b/lld/test/ELF/aarch64-thunk-sort.s
index 6166bc823601f..34cef2dabc818 100644
--- a/lld/test/ELF/aarch64-thunk-sort.s
+++ b/lld/test/ELF/aarch64-thunk-sort.s
@@ -1,5 +1,5 @@
 # REQUIRES: aarch64
-## By default a thunk section's forward thunks are sorted by descending destination so promoting
+## A thunk section's forward thunks are sorted by descending destination so promoting
 ## one to its long form cannot push another out of range. In creation order the promotions cascade,
 ## one per pass, and exceed convergence limit (issue #61250).
 
@@ -7,9 +7,6 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64 a.s -o a.o
 # RUN: ld.lld -T lds a.o -o out
 # RUN: llvm-objdump -d --no-show-raw-insn out | FileCheck %s
-## -z nosort-thunks keeps creation order and does not converge.
-# RUN: not ld.lld -T lds a.o -z nosort-thunks -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR
-# ERR: error: address assignment did not converge
 
 ## One thunk section holds both directions: backward thunks first, in creation
 ## order lo0, lo1, lo2 (they need no sorting), then forward thunks by descending
@@ -30,7 +27,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64 %p/Inputs/shared.s -o b.o
 # RUN: ld.lld -shared b.o -o b.so
 # RUN: llvm-mc -filetype=obj -triple=aarch64 c.s -o c.o
-# RUN: ld.lld -T lds2 c.o b.so -z sort-thunks -o out2
+# RUN: ld.lld -T lds2 c.o b.so -o out2
 # RUN: llvm-objdump -d --no-show-raw-insn out2 | FileCheck %s --check-prefix=PLT
 # PLT:      <__AArch64AbsLongThunk_cbwd>:
 # PLT:      <__AArch64AbsLongThunk_bar>: