diff --git a/devel/linux-rl9-lld/Makefile b/devel/linux-rl9-lld/Makefile
index 9e2cdfb314df..cfc4de37e58d 100644
--- a/devel/linux-rl9-lld/Makefile
+++ b/devel/linux-rl9-lld/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	lld
-PORTVERSION=	20.1.8
-DISTVERSIONSUFFIX=	-3.el9
+PORTVERSION=	21.1.8
+DISTVERSIONSUFFIX=	-2.el9
 CATEGORIES=	devel linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	The LLVM Linker for LLVM suite (Rocky Linux ${LINUX_DIST_VER})
 WWW=		http://llvm.org
 
 LICENSE=	GPLv2+
 
 USES=		cpe linux:rl9
 USE_LDCONFIG=	yes
 USE_LINUX=	elfutils-libelf python3
 USE_LINUX_RPM=	yes
 WANT_LINUX32=yes
 
 BIN_DISTNAMES=	${PORTNAME}-${DISTVERSIONFULL}
 LIB_DISTNAMES=	${PORTNAME}-devel-${DISTVERSIONFULL} \
 		${PORTNAME}-libs-${DISTVERSIONFULL}
 # src rpm is missing
 SRC_DISTFILES=
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 PLIST_SUB=	LIBVERSION=${PORTVERSION:R} BINVERSION=${PORTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/devel/linux-rl9-lld/distinfo b/devel/linux-rl9-lld/distinfo
index 796cc2688fd8..9685520dfeff 100644
--- a/devel/linux-rl9-lld/distinfo
+++ b/devel/linux-rl9-lld/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1765189914
-SHA256 (rocky/l/lld-20.1.8-3.el9.aarch64.rpm) = 915bfcede7380734594f1e004a9a1d21b02a19d96828d4d911c761719557ad7b
-SIZE (rocky/l/lld-20.1.8-3.el9.aarch64.rpm) = 35512
-SHA256 (rocky/l/lld-20.1.8-3.el9.x86_64.rpm) = 521c90a17afa2f68d489aeaa057c17b603d2a84cc9e3afaba8ca5fd5927ed82c
-SIZE (rocky/l/lld-20.1.8-3.el9.x86_64.rpm) = 35413
-SHA256 (rocky/l/lld-devel-20.1.8-3.el9.aarch64.rpm) = 2ac6e8a9da1136e7efd5aacd309699e666d605155c2f9e82f23e3f553888f04d
-SIZE (rocky/l/lld-devel-20.1.8-3.el9.aarch64.rpm) = 31795
-SHA256 (rocky/l/lld-devel-20.1.8-3.el9.i686.rpm) = 457f5484daca6860babb35dd701a831680f72a001b54f248d5f8661753da5d73
-SIZE (rocky/l/lld-devel-20.1.8-3.el9.i686.rpm) = 31765
-SHA256 (rocky/l/lld-devel-20.1.8-3.el9.x86_64.rpm) = 9e6927366486ecaaf6bb64ad129e991360f7bfdcab4a37b35ee58ae544a33866
-SIZE (rocky/l/lld-devel-20.1.8-3.el9.x86_64.rpm) = 31861
-SHA256 (rocky/l/lld-libs-20.1.8-3.el9.aarch64.rpm) = af8ab4cb154b052ad49b72e750b9a8d133d85428fba778a7d97a823702b5a24b
-SIZE (rocky/l/lld-libs-20.1.8-3.el9.aarch64.rpm) = 1808116
-SHA256 (rocky/l/lld-libs-20.1.8-3.el9.i686.rpm) = 8be5c46534342b3d6d935d91b73298d7437fbfb6be637b33cc67996b7bf0bf86
-SIZE (rocky/l/lld-libs-20.1.8-3.el9.i686.rpm) = 2054325
-SHA256 (rocky/l/lld-libs-20.1.8-3.el9.x86_64.rpm) = 3e91347cbe6c49e068c5d7f0cb32b9450bd31b804f63a2858a72fe403fc6712d
-SIZE (rocky/l/lld-libs-20.1.8-3.el9.x86_64.rpm) = 1936460
+TIMESTAMP = 1783865361
+SHA256 (rocky/l/lld-21.1.8-2.el9.aarch64.rpm) = e37c8a4f2be39d14fce97c26d44448eb2ce7b7a2d9b8a8ef70b8b85ab5669c61
+SIZE (rocky/l/lld-21.1.8-2.el9.aarch64.rpm) = 40050
+SHA256 (rocky/l/lld-21.1.8-2.el9.x86_64.rpm) = 3fedaf633d5c8f6534ec98ea0cac1d509f48dbe77e2f0f06ffd132c1df063bb2
+SIZE (rocky/l/lld-21.1.8-2.el9.x86_64.rpm) = 40290
+SHA256 (rocky/l/lld-devel-21.1.8-2.el9.aarch64.rpm) = a6fda7ed5cae52f3653e67bf0f55962510a229cc54f96aed9d96b551a81a8f3e
+SIZE (rocky/l/lld-devel-21.1.8-2.el9.aarch64.rpm) = 40960
+SHA256 (rocky/l/lld-devel-21.1.8-2.el9.i686.rpm) = 41a0e12a6b309cdd7b1b7c81b66dfbd98f0b3287765e0196b18adeaf2d4f21c5
+SIZE (rocky/l/lld-devel-21.1.8-2.el9.i686.rpm) = 40934
+SHA256 (rocky/l/lld-devel-21.1.8-2.el9.x86_64.rpm) = 43a1ccfbd2d48ad787992495b62fffde510f7a9c5f4acf5abc00a64cbcd90780
+SIZE (rocky/l/lld-devel-21.1.8-2.el9.x86_64.rpm) = 41024
+SHA256 (rocky/l/lld-libs-21.1.8-2.el9.aarch64.rpm) = 53308eccd4f611cbccef42ef0b156c3b4818ed3e3063001bd99ee41b0fb22875
+SIZE (rocky/l/lld-libs-21.1.8-2.el9.aarch64.rpm) = 1872580
+SHA256 (rocky/l/lld-libs-21.1.8-2.el9.i686.rpm) = 7bb0ad789960b8549a380409789ee991335de2986d1f3f7603aeb9d8ad265ea0
+SIZE (rocky/l/lld-libs-21.1.8-2.el9.i686.rpm) = 2103977
+SHA256 (rocky/l/lld-libs-21.1.8-2.el9.x86_64.rpm) = a5361fe5fd060a9b9978b987d1efb330e09bd97b6aee40d7a2a21a0ab9eb854b
+SIZE (rocky/l/lld-libs-21.1.8-2.el9.x86_64.rpm) = 1968567
diff --git a/devel/linux-rl9-lld/pkg-plist.aarch64 b/devel/linux-rl9-lld/pkg-plist.aarch64
index 4281bebea0a9..69e5545e5c15 100644
--- a/devel/linux-rl9-lld/pkg-plist.aarch64
+++ b/devel/linux-rl9-lld/pkg-plist.aarch64
@@ -1,80 +1,84 @@
 usr/bin/ld.lld
 usr/bin/ld64.lld
 usr/bin/ld64.lld-%%BINVERSION%%
 usr/bin/ld.lld-%%BINVERSION%%
 usr/bin/lld
 usr/bin/lld-link
 usr/bin/lld-link-%%BINVERSION%%
 usr/bin/lld-%%BINVERSION%%
 usr/bin/wasm-ld
 usr/bin/wasm-ld-%%BINVERSION%%
 usr/include/lld/Common/Args.h
 usr/include/lld/Common/Arrays.h
+usr/include/lld/Common/BPSectionOrdererBase.inc
 usr/include/lld/Common/CommonLinkerContext.h
 usr/include/lld/Common/DWARF.h
 usr/include/lld/Common/Driver.h
 usr/include/lld/Common/ErrorHandler.h
 usr/include/lld/Common/Filesystem.h
 usr/include/lld/Common/LLVM.h
 usr/include/lld/Common/Memory.h
 usr/include/lld/Common/Reproduce.h
 usr/include/lld/Common/Strings.h
 usr/include/lld/Common/TargetOptionsCommandFlags.h
 usr/include/lld/Common/Timer.h
+usr/include/lld/Common/Utils.h
 usr/include/lld/Common/Version.h
 usr/lib64/cmake/lld/LLDConfig.cmake
 usr/lib64/cmake/lld/LLDConfigVersion.cmake
 usr/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib64/cmake/lld/LLDTargets.cmake
 usr/lib64/liblldCOFF.so
 usr/lib64/liblldCOFF.so.%%LIBVERSION%%
 usr/lib64/liblldCommon.so
 usr/lib64/liblldCommon.so.%%LIBVERSION%%
 usr/lib64/liblldELF.so
 usr/lib64/liblldELF.so.%%LIBVERSION%%
 usr/lib64/liblldMachO.so
 usr/lib64/liblldMachO.so.%%LIBVERSION%%
 usr/lib64/liblldMinGW.so
 usr/lib64/liblldMinGW.so.%%LIBVERSION%%
 usr/lib64/liblldWasm.so
 usr/lib64/liblldWasm.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/bin/ld.lld
 usr/lib64/llvm%%BINVERSION%%/bin/ld64.lld
 usr/lib64/llvm%%BINVERSION%%/bin/lld
 usr/lib64/llvm%%BINVERSION%%/bin/lld-link
 usr/lib64/llvm%%BINVERSION%%/bin/wasm-ld
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Args.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Arrays.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/BPSectionOrdererBase.inc
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/CommonLinkerContext.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/DWARF.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Driver.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/ErrorHandler.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Filesystem.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/LLVM.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Memory.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Reproduce.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Strings.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/TargetOptionsCommandFlags.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Timer.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Utils.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Version.h
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfig.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfigVersion.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so.%%LIBVERSION%%
 usr/share/licenses/lld/LICENSE.TXT
 usr/share/licenses/lld-devel/LICENSE.TXT
 usr/share/licenses/lld-libs/LICENSE.TXT
 usr/share/man/man1/ld.lld.1.gz
 usr/share/man/man1/ld.lld-%%BINVERSION%%.1.gz
diff --git a/devel/linux-rl9-lld/pkg-plist.amd64 b/devel/linux-rl9-lld/pkg-plist.amd64
index 82ca9debc476..c33c421b0466 100644
--- a/devel/linux-rl9-lld/pkg-plist.amd64
+++ b/devel/linux-rl9-lld/pkg-plist.amd64
@@ -1,126 +1,132 @@
 usr/bin/ld.lld
 usr/bin/ld64.lld
 usr/bin/ld64.lld-%%BINVERSION%%
 usr/bin/ld.lld-%%BINVERSION%%
 usr/bin/lld
 usr/bin/lld-link
 usr/bin/lld-link-%%BINVERSION%%
 usr/bin/lld-%%BINVERSION%%
 usr/bin/wasm-ld
 usr/bin/wasm-ld-%%BINVERSION%%
 usr/include/lld/Common/Args.h
 usr/include/lld/Common/Arrays.h
+usr/include/lld/Common/BPSectionOrdererBase.inc
 usr/include/lld/Common/CommonLinkerContext.h
 usr/include/lld/Common/DWARF.h
 usr/include/lld/Common/Driver.h
 usr/include/lld/Common/ErrorHandler.h
 usr/include/lld/Common/Filesystem.h
 usr/include/lld/Common/LLVM.h
 usr/include/lld/Common/Memory.h
 usr/include/lld/Common/Reproduce.h
 usr/include/lld/Common/Strings.h
 usr/include/lld/Common/TargetOptionsCommandFlags.h
 usr/include/lld/Common/Timer.h
+usr/include/lld/Common/Utils.h
 usr/include/lld/Common/Version.h
 usr/lib/cmake/lld/LLDConfig.cmake
 usr/lib/cmake/lld/LLDConfigVersion.cmake
 usr/lib/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib/cmake/lld/LLDTargets.cmake
 usr/lib/liblldCOFF.so
 usr/lib/liblldCOFF.so.%%LIBVERSION%%
 usr/lib/liblldCommon.so
 usr/lib/liblldCommon.so.%%LIBVERSION%%
 usr/lib/liblldELF.so
 usr/lib/liblldELF.so.%%LIBVERSION%%
 usr/lib/liblldMachO.so
 usr/lib/liblldMachO.so.%%LIBVERSION%%
 usr/lib/liblldMinGW.so
 usr/lib/liblldMinGW.so.%%LIBVERSION%%
 usr/lib/liblldWasm.so
 usr/lib/liblldWasm.so.%%LIBVERSION%%
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Args.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Arrays.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/BPSectionOrdererBase.inc
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/CommonLinkerContext.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/DWARF.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Driver.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/ErrorHandler.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Filesystem.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/LLVM.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Memory.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Reproduce.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Strings.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/TargetOptionsCommandFlags.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Timer.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Util.h
 usr/lib/llvm%%BINVERSION%%/include/lld/Common/Version.h
 usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDConfig.cmake
 usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDConfigVersion.cmake
 usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDTargets.cmake
 usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib/llvm%%BINVERSION%%/lib/liblldCOFF.so
 usr/lib/llvm%%BINVERSION%%/lib/liblldCOFF.so.%%LIBVERSION%%
 usr/lib/llvm%%BINVERSION%%/lib/liblldCommon.so
 usr/lib/llvm%%BINVERSION%%/lib/liblldCommon.so.%%LIBVERSION%%
 usr/lib/llvm%%BINVERSION%%/lib/liblldELF.so
 usr/lib/llvm%%BINVERSION%%/lib/liblldELF.so.%%LIBVERSION%%
 usr/lib/llvm%%BINVERSION%%/lib/liblldMachO.so
 usr/lib/llvm%%BINVERSION%%/lib/liblldMachO.so.%%LIBVERSION%%
 usr/lib/llvm%%BINVERSION%%/lib/liblldMinGW.so
 usr/lib/llvm%%BINVERSION%%/lib/liblldMinGW.so.%%LIBVERSION%%
 usr/lib/llvm%%BINVERSION%%/lib/liblldWasm.so
 usr/lib/llvm%%BINVERSION%%/lib/liblldWasm.so.%%LIBVERSION%%
 usr/lib64/cmake/lld/LLDConfig.cmake
 usr/lib64/cmake/lld/LLDConfigVersion.cmake
 usr/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib64/cmake/lld/LLDTargets.cmake
 usr/lib64/liblldCOFF.so
 usr/lib64/liblldCOFF.so.%%LIBVERSION%%
 usr/lib64/liblldCommon.so
 usr/lib64/liblldCommon.so.%%LIBVERSION%%
 usr/lib64/liblldELF.so
 usr/lib64/liblldELF.so.%%LIBVERSION%%
 usr/lib64/liblldMachO.so
 usr/lib64/liblldMachO.so.%%LIBVERSION%%
 usr/lib64/liblldMinGW.so
 usr/lib64/liblldMinGW.so.%%LIBVERSION%%
 usr/lib64/liblldWasm.so
 usr/lib64/liblldWasm.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/bin/ld.lld
 usr/lib64/llvm%%BINVERSION%%/bin/ld64.lld
 usr/lib64/llvm%%BINVERSION%%/bin/lld
 usr/lib64/llvm%%BINVERSION%%/bin/lld-link
 usr/lib64/llvm%%BINVERSION%%/bin/wasm-ld
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Args.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Arrays.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/BPSectionOrdererBase.inc
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/CommonLinkerContext.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/DWARF.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Driver.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/ErrorHandler.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Filesystem.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/LLVM.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Memory.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Reproduce.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Strings.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/TargetOptionsCommandFlags.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Timer.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Utils.h
 usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Version.h
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfig.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfigVersion.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so.%%LIBVERSION%%
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so
 usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so.%%LIBVERSION%%
 usr/share/licenses/lld/LICENSE.TXT
 usr/share/licenses/lld-devel/LICENSE.TXT
 usr/share/licenses/lld-libs/LICENSE.TXT
 usr/share/man/man1/ld.lld.1.gz
 usr/share/man/man1/ld.lld-%%BINVERSION%%.1.gz