From 6cf255cc2bed26048be3feb9414f5db723d281a4 Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Fri, 1 May 2026 11:02:06 +0000
Subject: [PATCH] Remove Wasm exception handling workarounds.

---
 CMakeLists.txt           |  7 -------
 common/kernel/nextpnr.cc | 17 -----------------
 2 files changed, 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 957663ba..65f167b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,13 +108,6 @@ endif()
 
 if (WASI)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lwasi-emulated-mman")
-    add_definitions(
-        -DBOOST_EXCEPTION_DISABLE
-        -DBOOST_NO_EXCEPTIONS
-    )
-    if (NOT Threads_FOUND)
-        add_definitions(-DBOOST_NO_CXX11_HDR_MUTEX)
-    endif()
 endif()
 
 if (STATIC_BUILD)
diff --git a/common/kernel/nextpnr.cc b/common/kernel/nextpnr.cc
index 8c902d88..b7530642 100644
--- a/common/kernel/nextpnr.cc
+++ b/common/kernel/nextpnr.cc
@@ -16,20 +16,3 @@
  *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-
-#if defined(__wasm)
-#include <exception>
-#include <typeinfo>
-#include "log.h"
-
-extern "C" {
-// FIXME: WASI does not currently support exceptions.
-void *__cxa_allocate_exception(size_t thrown_size) throw() { return malloc(thrown_size); }
-bool __cxa_uncaught_exception() throw();
-void __cxa_throw(void *thrown_exception, struct std::type_info *tinfo, void (*dest)(void *)) { std::terminate(); }
-}
-
-namespace boost {
-void throw_exception(std::exception const &e) { NEXTPNR_NAMESPACE::log_error("boost::exception(): %s\n", e.what()); }
-} // namespace boost
-#endif