diff --git a/.gitmodules b/.gitmodules
index 664ce429..dedda16d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "crosstool-ng"]
 	path = crosstool-ng
-	url = https://github.com/zephyrproject-rtos/crosstool-ng.git
+	url = https://github.com/adigie/crosstool-ng.git
 [submodule "binutils"]
 	path = binutils
 	url = https://github.com/zephyrproject-rtos/binutils-gdb.git
diff --git a/cmake/zephyr/generic.cmake b/cmake/zephyr/generic.cmake
index 2c914d8e..20291dc1 100644
--- a/cmake/zephyr/generic.cmake
+++ b/cmake/zephyr/generic.cmake
@@ -31,3 +31,4 @@ set(CROSS_COMPILE ${one_toolchain_root}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMP
 set(SYSROOT_DIR   ${one_toolchain_root}/${SYSROOT_TARGET}/${SYSROOT_TARGET})
 set(TOOLCHAIN_HAS_NEWLIB ON CACHE BOOL "True if toolchain supports newlib")
 set(TOOLCHAIN_HAS_PICOLIBC ON CACHE BOOL "True if toolchain supports picolibc")
+set(TOOLCHAIN_HAS_PICOLIBC_NOEXCEPT ON CACHE BOOL "True if toolchain supports picolibc variant with exceptions disabled")
diff --git a/crosstool-ng b/crosstool-ng
index 53b5327d..9758059d 160000
--- a/crosstool-ng
+++ b/crosstool-ng
@@ -1 +1 @@
-Subproject commit 53b5327d821a6b6949fa455f14a9631146af897c
+Subproject commit 9758059d3adc0a4dc4878d7b6b80f212f02da619