Skip to content

Commit 2ddee72

Browse files
committed
Merge branch 'feature/toolchain-80-g6c4433a' into 'master'
Toolchain: Update to version 1.22.0-80-g6c4433a See merge request !1771
2 parents 914ab07 + 38e15e6 commit 2ddee72

9 files changed

+9
-17
lines changed

components/esp32/Makefile.projbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,5 @@ endif # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
3636
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
3737
CFLAGS+=-mfix-esp32-psram-cache-issue
3838
CXXFLAGS+=-mfix-esp32-psram-cache-issue
39-
#Filter out the standard libstdc++ linkage. The component.mk will add a specific
40-
#cache-workaround-enabled version.
41-
LDFLAGS:=$(filter-out -lstdc++,$(LDFLAGS))
4239
endif
4340

components/esp32/component.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libhal.a \
3838
-u ld_include_panic_highint_hdl \
3939
$(addprefix -T ,$(LINKER_SCRIPTS))
4040

41-
#The cache workaround also needs a c++ standard library recompiled with the workaround.
42-
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
43-
COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libstdc++-psram-workaround.a
44-
endif
45-
4641
ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
4742

4843
COMPONENT_SUBMODULES += lib
-15.9 MB
Binary file not shown.

docs/get-started/linux-setup.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ ESP32 toolchain for Linux is available for download from Espressif website:
2828

2929
- for 64-bit Linux:
3030

31-
https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-75-gbaf03c2-5.2.0.tar.gz
31+
https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
3232

3333
- for 32-bit Linux:
3434

35-
https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-75-gbaf03c2-5.2.0.tar.gz
35+
https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-80-g6c4433a-5.2.0.tar.gz
3636

3737
1. Download this file, then extract it in ``~/esp`` directory::
3838

3939
mkdir -p ~/esp
4040
cd ~/esp
41-
tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-75-gbaf03c2-5.2.0.tar.gz
41+
tar -xzf ~/Downloads/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
4242

4343
.. _setup-linux-toolchain-add-it-to-path:
4444

docs/get-started/macos-setup.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Toolchain Setup
1919

2020
ESP32 toolchain for macOS is available for download from Espressif website:
2121

22-
https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-75-gbaf03c2-5.2.0.tar.gz
22+
https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz
2323

2424
Download this file, then extract it in ``~/esp`` directory::
2525

2626
mkdir -p ~/esp
2727
cd ~/esp
28-
tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-75-gbaf03c2-5.2.0.tar.gz
28+
tar -xzf ~/Downloads/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz
2929

3030
.. _setup-macos-toolchain-add-it-to-path:
3131

docs/get-started/windows-setup-scratch.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Alternative Setup: Just download a toolchain
7878

7979
If you already have an MSYS2 install or want to do things differently, you can download just the toolchain here:
8080

81-
https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-75-gbaf03c2-5.2.0.zip
81+
https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip
8282

8383
.. note::
8484

docs/get-started/windows-setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Toolchain Setup
1313

1414
The quick setup is to download the Windows all-in-one toolchain & MSYS2 zip file from dl.espressif.com:
1515

16-
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20171123.zip
16+
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20180110.zip
1717

1818
Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an ``msys32`` directory with a pre-prepared environment.
1919

make/project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|.*crosstool-ng-(
527527
TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(.*\)\ (.*)|\1|gp')
528528

529529
# Officially supported version(s)
530-
SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-75-gbaf03c2
530+
SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-80-g6c4433a
531531
SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
532532

533533
ifdef TOOLCHAIN_COMMIT_DESC

tools/windows/windows_install_prerequisites.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ python -m pip install --upgrade pip
4444
pip install pyserial
4545

4646
# Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
47-
TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-75-gbaf03c2-5.2.0.zip
47+
TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip
4848
echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
4949
cd ~
5050
curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}

0 commit comments

Comments
 (0)