7 files changed, 29 insertions, 23 deletions
diff --git a/cad/yosys/Makefile b/cad/yosys/Makefile
index 9ff7e94963c6..54f6353321ee 100644
--- a/cad/yosys/Makefile
+++ b/cad/yosys/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yosys
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.52
+DISTVERSION=	0.58
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/yosys/distinfo b/cad/yosys/distinfo
index 01a4fd06fe8d..38209db4e411 100644
--- a/cad/yosys/distinfo
+++ b/cad/yosys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745810869
-SHA256 (YosysHQ-yosys-v0.52_GH0.tar.gz) = b6212f132edb4127099406ebdd1c6aee0f5db4175d8ce44053c45089e00dabbe
-SIZE (YosysHQ-yosys-v0.52_GH0.tar.gz) = 3295413
+TIMESTAMP = 1760017745
+SHA256 (YosysHQ-yosys-v0.58_GH0.tar.gz) = e2b8cba71da7be9009175691dade2ee98072f542e456a92d53a4f1a1bad05bd5
+SIZE (YosysHQ-yosys-v0.58_GH0.tar.gz) = 3427401
diff --git a/cad/yosys/files/patch-backends_smt2_smtio.py b/cad/yosys/files/patch-backends_smt2_smtio.py
index a39fc9c4fc91..81c3557845d1 100644
--- a/cad/yosys/files/patch-backends_smt2_smtio.py
+++ b/cad/yosys/files/patch-backends_smt2_smtio.py
@@ -1,6 +1,6 @@
---- backends/smt2/smtio.py.orig	2023-01-04 19:51:15 UTC
+--- backends/smt2/smtio.py.orig	2025-09-21 17:50:33 UTC
 +++ backends/smt2/smtio.py
-@@ -182,9 +182,9 @@ class SmtIo:
+@@ -199,9 +199,9 @@ class SmtIo:
                  self.noincr = True
  
              if self.noincr:
diff --git a/cad/yosys/files/patch-kernel_driver.cc b/cad/yosys/files/patch-kernel_driver.cc
index cb4521933188..9e98a7f0ca97 100644
--- a/cad/yosys/files/patch-kernel_driver.cc
+++ b/cad/yosys/files/patch-kernel_driver.cc
@@ -1,9 +1,9 @@
---- kernel/driver.cc.orig	2025-04-09 05:38:42 UTC
+--- kernel/driver.cc.orig	2025-09-04 06:00:38 UTC
 +++ kernel/driver.cc
-@@ -20,7 +20,7 @@
- #include "kernel/yosys.h"
+@@ -21,7 +21,7 @@
  #include "kernel/hashlib.h"
  #include "libs/sha1/sha1.h"
+ #define CXXOPTS_VECTOR_DELIMITER '\0'
 -#include "libs/cxxopts/include/cxxopts.hpp"
 +#include <cxxopts.hpp>
  #include <iostream>
diff --git a/cad/yosys/files/patch-libs_fst_fstapi.cc b/cad/yosys/files/patch-libs_fst_fstapi.cc
deleted file mode 100644
index 06efaf1a57fd..000000000000
--- a/cad/yosys/files/patch-libs_fst_fstapi.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- libs/fst/fstapi.cc.orig	2022-02-10 19:07:14 UTC
-+++ libs/fst/fstapi.cc
-@@ -62,7 +62,11 @@
- #endif
- 
- #ifdef HAVE_ALLOCA_H
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#else
- #include <alloca.h>
-+#endif
- #elif defined(__GNUC__)
- #ifndef __MINGW32__
- #ifndef alloca
diff --git a/cad/yosys/files/patch-passes_cmds_bugpoint.cc b/cad/yosys/files/patch-passes_cmds_bugpoint.cc
new file mode 100644
index 000000000000..af6de092e41e
--- /dev/null
+++ b/cad/yosys/files/patch-passes_cmds_bugpoint.cc
@@ -0,0 +1,18 @@
+--- passes/cmds/bugpoint.cc.orig	2025-09-21 18:06:28 UTC
++++ passes/cmds/bugpoint.cc
+@@ -22,13 +22,14 @@
+ 
+ #if defined(_WIN32)
+ #  include <csignal>
++#endif
++
+ #  define WIFEXITED(x) 1
+ #  define WIFSIGNALED(x) 0
+ #  define WIFSTOPPED(x) 0
+ #  define WEXITSTATUS(x) ((x) & 0xff)
+ #  define WTERMSIG(x) SIGTERM
+ #  define WSTOPSIG(x) 0
+-#endif
+ 
+ USING_YOSYS_NAMESPACE
+ using namespace RTLIL_BACKEND;
diff --git a/cad/yosys/pkg-plist b/cad/yosys/pkg-plist
index 3502eb9eccf7..213697c05be5 100644
--- a/cad/yosys/pkg-plist
+++ b/cad/yosys/pkg-plist
@@ -141,6 +141,7 @@ bin/yosys-witness
 %%DATADIR%%/include/kernel/scopeinfo.h
 %%DATADIR%%/include/kernel/sexpr.h
 %%DATADIR%%/include/kernel/sigtools.h
+%%DATADIR%%/include/kernel/threading.h
 %%DATADIR%%/include/kernel/timinginfo.h
 %%DATADIR%%/include/kernel/utils.h
 %%DATADIR%%/include/kernel/yosys.h
@@ -152,6 +153,7 @@ bin/yosys-witness
 %%DATADIR%%/include/libs/json11/json11.hpp
 %%DATADIR%%/include/libs/sha1/sha1.h
 %%DATADIR%%/include/passes/fsm/fsmdata.h
+%%DATADIR%%/include/passes/techmap/libparse.h
 %%DATADIR%%/intel/common/altpll_bb.v
 %%DATADIR%%/intel/common/brams_m9k.txt
 %%DATADIR%%/intel/common/brams_map_m9k.v