From ca323fbaad540cf66cb267c0f749ad24f3a9b211 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 24 May 2019 14:05:21 +0800
Subject: [PATCH] update toolchain to esp32-2019r1 release

Closes https://github.com/espressif/esp-idf/issues/1445 (std::to_string)
Closes https://github.com/espressif/esp-idf/issues/1876 (std::chrono_steady_clock)
Closes https://github.com/espressif/esp-idf/issues/1995 (std::timed_mutex)
Closes https://github.com/espressif/esp-idf/issues/2149 (addr2line)
Closes https://github.com/espressif/esp-idf/issues/2308 (lsiu/lsip)
Closes https://github.com/espressif/esp-idf/issues/2449 (c++17)
Closes https://github.com/espressif/esp-idf/issues/3258 (objdump)
---
 tools/test_idf_tools/test_idf_tools.py |  2 +-
 tools/toolchain_versions.mk            | 10 ++---
 tools/tools.json                       | 51 +++++++++++++-------------
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py
index 6e39f5f951..49927d39f2 100755
--- a/tools/test_idf_tools/test_idf_tools.py
+++ b/tools/test_idf_tools/test_idf_tools.py
@@ -71,7 +71,7 @@ class TestUsage(unittest.TestCase):
             idf_tools.main(['list'])
         output = output_stream.getvalue()
 
-        xtensa_esp32_elf_version = '1.22.0-80-g6c4433a-5.2.0'
+        xtensa_esp32_elf_version = 'esp32-2019r1-8.2.0'
         esp32ulp_version = '2.28.51.20170517'
 
         self.assertIn('* xtensa-esp32-elf:', output)
diff --git a/tools/toolchain_versions.mk b/tools/toolchain_versions.mk
index cf74ef5ec6..c8b26fe3ca 100644
--- a/tools/toolchain_versions.mk
+++ b/tools/toolchain_versions.mk
@@ -1,6 +1,6 @@
-SUPPORTED_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-80-g6c4433a
-SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 5.2.0
+SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp32-2019r1
+SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 8.2.0
 
-CURRENT_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-80-g6c4433a
-CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = 1.22.0-80-g6c4433a
-CURRENT_TOOLCHAIN_GCC_VERSION = 5.2.0
+CURRENT_TOOLCHAIN_COMMIT_DESC = esp32-2019r1
+CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp32-2019r1
+CURRENT_TOOLCHAIN_GCC_VERSION = 8.2.0
diff --git a/tools/tools.json b/tools/tools.json
index b97eb5e4dc..3d0941660f 100644
--- a/tools/tools.json
+++ b/tools/tools.json
@@ -20,38 +20,39 @@
       "version_regex": "\\(crosstool-NG\\s+(?:crosstool-ng-)?([0-9a-z\\.\\-]+)\\)\\s*([0-9\\.]+)",
       "version_regex_replace": "\\1-\\2",
       "versions": [
-        {
-          "name": "1.22.0-80-g6c4433a5-5.2.0",
-          "status": "recommended",
-          "win32": {
-            "sha256": "f217fccbeaaa8c92db239036e0d6202458de4488b954a3a38f35ac2ec48058a4",
-            "size": 125719261,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip"
-          },
-          "win64": {
-            "sha256": "f217fccbeaaa8c92db239036e0d6202458de4488b954a3a38f35ac2ec48058a4",
-            "size": 125719261,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip"
-          }
-        },
         {
           "linux-amd64": {
-            "sha256": "3fe96c151d46c1d4e5edc6ed690851b8e53634041114bad04729bc16b0445156",
-            "size": 44219107,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz"
+            "sha256": "39db59b13f25e83e53c55f56979dbfce77b7f23126ad79de833509ad902d3f0a",
+            "size": 63025996,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-amd64.tar.gz"
+          },
+          "linux-armel": {
+            "sha256": "4ffd19839fcb241af3111da7c419448b80be3bd844da570e95f8f3d5a7eccf79",
+            "size": 61164309,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-armel.tar.gz"
           },
           "linux-i686": {
-            "sha256": "b4055695ffc2dfc0bcb6dafdc2572a6e01151c4179ef5fa972b3fcb2183eb155",
-            "size": 45566336,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-80-g6c4433a-5.2.0.tar.gz"
+            "sha256": "85c02a4310bb97ac46e6f943b0de10e9e9572596c7d33d09b6f93f8bace3b784",
+            "size": 65016647,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-i686.tar.gz"
           },
           "macos": {
-            "sha256": "a4307a97945d2f2f2745f415fbe80d727750e19f91f9a1e7e2f8a6065652f9da",
-            "size": 46517409,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz"
+            "sha256": "adb256394c948ca424ec6ef1d9bee91baa99a304d8ace8e6701303da952eb007",
+            "size": 69674700,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-macos.tar.gz"
           },
-          "name": "1.22.0-80-g6c4433a-5.2.0",
-          "status": "recommended"
+          "name": "esp32-2019r1-8.2.0",
+          "status": "recommended",
+          "win32": {
+            "sha256": "ff00dbb02287219a61873c3b2649a50b94e80c82e607c336383f2838abbefbde",
+            "size": 73245169,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip"
+          },
+          "win64": {
+            "sha256": "ff00dbb02287219a61873c3b2649a50b94e80c82e607c336383f2838abbefbde",
+            "size": 73245169,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip"
+          }
         }
       ]
     },