diff --git a/devel/mold/Makefile b/devel/mold/Makefile
index ea0cf7b081c3..e826ffc21c51 100644
--- a/devel/mold/Makefile
+++ b/devel/mold/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	mold
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.32.1
+DISTVERSION=	2.35.0
 CATEGORIES=	devel
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Modern Linker
 WWW=		https://github.com/rui314/mold
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	armhf armv7 i386
 
 LIB_DEPENDS=	libmimalloc.so:devel/mimalloc \
 		libtbb.so:devel/onetbb \
 		libzstd.so:archivers/zstd
 TEST_DEPENDS=	bash:shells/bash \
 		gcc${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT} \
 		ggrep:textproc/gnugrep \
 		${LOCALBASE}/bin/readelf:devel/binutils
 
 USES=		cmake:testing compiler:c++20-lang localbase:ldflags shebangfix
-SHEBANG_FILES=	test/elf/*.sh
+SHEBANG_FILES=	test/*.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rui314
 
 PLIST_FILES=	bin/ld.mold \
 		bin/mold \
 		lib/mold/mold-wrapper.so \
 		libexec/mold/ld \
 		share/man/man1/ld.mold.1.gz \
 		share/man/man1/mold.1.gz
 
 
 CMAKE_TESTING_OFF=	MOLD_ENABLE_QEMU_TESTS
 
 CMAKE_ON=	MOLD_USE_MIMALLOC \
 		MOLD_USE_SYSTEM_MIMALLOC \
 		MOLD_USE_SYSTEM_TBB
 
 CMAKE_OFF=	MOLD_USE_MOLD \
 		MOLD_USE_TSAN \
 		MOLD_MOSTLY_STATIC \
 		BUILD_TESTING
 
 OPTIONS_DEFINE=	ASAN LTO
 
 ASAN_DESC=	Enable Address Sanitizer
 
 ASAN_CMAKE_BOOL=MOLD_USE_ASAN
 
 LTO_CMAKE_BOOL=	MOLD_LTO
 
 pre-test:
 	### BINARY_ALIAS doesn't work for tests so we need to fix it manually
 	@${REINPLACE_CMD} -e 's|OBJCOPY=objcopy|OBJCOPY=${PREFIX}/bin/objcopy|g' \
-	    ${PATCH_WRKSRC}/test/elf/common.inc
+	    ${PATCH_WRKSRC}/test/common.inc
 	@${REINPLACE_CMD} -e 's|OBJDUMP=objdump|OBJDUMP=${PREFIX}/bin/objdump|g' \
-	    ${PATCH_WRKSRC}/test/elf/common.inc
+	    ${PATCH_WRKSRC}/test/common.inc
 	@${REINPLACE_CMD} -e 's|$$GCC |gcc${GCC_DEFAULT} |g' \
-	    ${PATCH_WRKSRC}/test/elf/*.sh
+	    ${PATCH_WRKSRC}/test/*.sh
 	@${REINPLACE_CMD} -e 's|gcc |gcc${GCC_DEFAULT} |g' \
-	    ${PATCH_WRKSRC}/test/elf/*.sh
+	    ${PATCH_WRKSRC}/test/*.sh
 	@${REINPLACE_CMD} -e 's|grep -|${PREFIX}/bin/ggrep -|g' \
-	    ${PATCH_WRKSRC}/test/elf/*.sh
+	    ${PATCH_WRKSRC}/test/*.sh
 	@${REINPLACE_CMD} -e 's|readelf |${PREFIX}/bin/readelf |g' \
-	    ${PATCH_WRKSRC}/test/elf/*.sh
+	    ${PATCH_WRKSRC}/test/*.sh
 	### Depends on LLVMgold plugin which isn't built by binutils
-	@${RM} ${WRKSRC}/test/elf/defsym-lto.sh
-	@${RM} ${WRKSRC}/test/elf/lto-archive.sh
-	@${RM} ${WRKSRC}/test/elf/lto-archive2.sh
-	@${RM} ${WRKSRC}/test/elf/lto-dso.sh
-	@${RM} ${WRKSRC}/test/elf/lto-version-script.sh
-	@${RM} ${WRKSRC}/test/elf/symbol-version-lto.sh
+	@${RM} ${WRKSRC}/test/defsym-lto.sh
+	@${RM} ${WRKSRC}/test/lto-archive.sh
+	@${RM} ${WRKSRC}/test/lto-archive2.sh
+	@${RM} ${WRKSRC}/test/lto-dso.sh
+	@${RM} ${WRKSRC}/test/lto-version-script.sh
+	@${RM} ${WRKSRC}/test/symbol-version-lto.sh
 	### These tests errors out with "Unsupported relocation type 36 in non-PLT relocations"
-	@${RM} ${WRKSRC}/test/elf/tlsdesc.sh
-	@${RM} ${WRKSRC}/test/elf/tlsdesc-dlopen.sh
-	@${RM} ${WRKSRC}/test/elf/tlsdesc-initial-exec.sh
-	@${RM} ${WRKSRC}/test/elf/tlsdesc-local-dynamic.sh
-	@${RM} ${WRKSRC}/test/elf/wrap-lto.sh
-	@${RM} ${WRKSRC}/test/elf/x86_64_tlsdesc.sh
-	@${RM} ${WRKSRC}/test/elf/x86_64_tls-module-base.sh
+	@${RM} ${WRKSRC}/test/tlsdesc.sh
+	@${RM} ${WRKSRC}/test/tlsdesc-dlopen.sh
+	@${RM} ${WRKSRC}/test/tlsdesc-initial-exec.sh
+	@${RM} ${WRKSRC}/test/tlsdesc-local-dynamic.sh
+	@${RM} ${WRKSRC}/test/wrap-lto.sh
+	@${RM} ${WRKSRC}/test/x86_64_tlsdesc.sh
+	@${RM} ${WRKSRC}/test/x86_64_tls-module-base.sh
 
 .include <bsd.port.mk>
diff --git a/devel/mold/distinfo b/devel/mold/distinfo
index 111df3b25f37..b13f84f03637 100644
--- a/devel/mold/distinfo
+++ b/devel/mold/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720971087
-SHA256 (rui314-mold-v2.32.1_GH0.tar.gz) = f3c9a527d884c635834fe7d79b3de959b00783bf9446280ea274d996f0335825
-SIZE (rui314-mold-v2.32.1_GH0.tar.gz) = 10010384
+TIMESTAMP = 1733713960
+SHA256 (rui314-mold-v2.35.0_GH0.tar.gz) = 2703f1c88c588523815886478950bcae1ef02190dc4787e0d120a293b1a46e3b
+SIZE (rui314-mold-v2.35.0_GH0.tar.gz) = 10056856
diff --git a/devel/mold/files/patch-common_filepath.cc b/devel/mold/files/patch-common_filepath.cc
deleted file mode 100644
index 12d71a2034c8..000000000000
--- a/devel/mold/files/patch-common_filepath.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- common/filepath.cc.orig	2024-05-03 15:37:12 UTC
-+++ common/filepath.cc
-@@ -3,6 +3,10 @@
- #include <filesystem>
- #include <sys/stat.h>
- 
-+#ifdef __FreeBSD__
-+# include <sys/sysctl.h>
-+#endif
-+
- #ifdef __APPLE__
- # include <mach-o/dyld.h>
- #endif