diff --git a/docs/get-started/linux-setup.rst b/docs/get-started/linux-setup.rst
index 2caf323ddb..918e938e35 100644
--- a/docs/get-started/linux-setup.rst
+++ b/docs/get-started/linux-setup.rst
@@ -28,17 +28,17 @@ ESP32 toolchain for Linux is available for download from Espressif website:
 
 - for 64-bit Linux:
 
-  https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz
+  https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-70-gfa0bad1-5.2.0.tar.gz
 
 - for 32-bit Linux:
 
-  https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz
+  https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-70-gfa0bad1-5.2.0.tar.gz
 
 1.  Download this file, then extract it in ``~/esp`` directory::
 
         mkdir -p ~/esp
         cd ~/esp
-        tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz
+        tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-70-gfa0bad1-5.2.0.tar.gz
 
 .. _setup-linux-toolchain-add-it-to-path:
 
diff --git a/docs/get-started/macos-setup.rst b/docs/get-started/macos-setup.rst
index 328e4f2255..0fdb4fc6da 100644
--- a/docs/get-started/macos-setup.rst
+++ b/docs/get-started/macos-setup.rst
@@ -19,13 +19,13 @@ Toolchain Setup
 
 ESP32 toolchain for macOS is available for download from Espressif website:
 
-https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-61-gab8375a-5.2.0.tar.gz
+https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-70-gfa0bad1-5.2.0.tar.gz
 
 Download this file, then extract it in ``~/esp`` directory::
 
     mkdir -p ~/esp
     cd ~/esp
-    tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-61-gab8375a-5.2.0.tar.gz
+    tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-70-gfa0bad1-5.2.0.tar.gz
 
 .. _setup-macos-toolchain-add-it-to-path:
 
diff --git a/docs/get-started/windows-setup-scratch.rst b/docs/get-started/windows-setup-scratch.rst
index 435bd55511..94f883d173 100644
--- a/docs/get-started/windows-setup-scratch.rst
+++ b/docs/get-started/windows-setup-scratch.rst
@@ -72,7 +72,7 @@ Alternative Setup: Just download a toolchain
 
 If you already have an MSYS2 install or want to do things differently, you can download just the toolchain here:
 
-https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0.zip
+https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-70-gfa0bad1-5.2.0.zip
 
 .. note::
 
diff --git a/make/project.mk b/make/project.mk
index 526cee3517..eb90b0a465 100644
--- a/make/project.mk
+++ b/make/project.mk
@@ -289,7 +289,6 @@ CXXFLAGS ?=
 EXTRA_CXXFLAGS ?=
 CXXFLAGS := $(strip \
 	-std=gnu++11 \
-	-fno-exceptions \
 	-fno-rtti \
 	$(OPTIMIZATION_FLAGS) $(DEBUG_FLAGS) \
 	$(COMMON_FLAGS) \
@@ -491,11 +490,11 @@ list-components:
 # the part after the brackets is extracted into TOOLCHAIN_GCC_VER.
 ifdef CONFIG_TOOLPREFIX
 ifndef MAKE_RESTARTS
-TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(([^)]*).*|\1|gp')
+TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|.*crosstool-ng-([0-9]+).([0-9]+).([0-9]+)-([0-9]+)-g([0-9a-f]{7}).*|\1.\2.\3-\4-g\5|gp')
 TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(.*\)\ (.*)|\1|gp')
 
 # Officially supported version(s)
-SUPPORTED_TOOLCHAIN_COMMIT_DESC := crosstool-NG crosstool-ng-1.22.0-61-gab8375a
+SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-70-gfa0bad1
 SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
 
 ifdef TOOLCHAIN_COMMIT_DESC
diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh
index b4d6337682..5bdf280ee0 100644
--- a/tools/windows/windows_install_prerequisites.sh
+++ b/tools/windows/windows_install_prerequisites.sh
@@ -35,12 +35,16 @@ pacman --noconfirm -Syu # This step may require the terminal to be closed and re
 
 pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim mingw-w64-i686-python2-pip unzip winpty
 
+# Workaround for errors when running "git submodule" commands
+# See https://github.com/Alexpux/MSYS2-packages/issues/735
+rm /mingw32/bin/envsubst.exe
+
 python -m pip install --upgrade pip
 
 pip install pyserial
 
 # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
-TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0.zip
+TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-70-gfa0bad1-5.2.0.zip
 echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
 cd ~
 curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}