From 35316de8d3aa6ad13abf93de8a38f68ffd5dfc39 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 17 Jan 2017 12:45:03 +0200
Subject: [PATCH] revert toolchain for windows

---
 cores/esp32/main.cpp                      | 37 +++++++++++++++++++++++
 package/package_esp32_index.template.json | 12 ++++----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
index c2300b41..4277b35e 100644
--- a/cores/esp32/main.cpp
+++ b/cores/esp32/main.cpp
@@ -19,3 +19,40 @@ extern "C" void app_main()
 }
 
 #endif
+
+/*
+**  Block below to be removed with next toolchain
+*/
+void *operator new(size_t size)
+{
+    return malloc(size);
+}
+
+void *operator new[](size_t size)
+{
+    return malloc(size);
+}
+
+void operator delete(void * ptr)
+{
+    free(ptr);
+}
+
+void operator delete[](void * ptr)
+{
+    free(ptr);
+}
+
+extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
+extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
+
+void __cxa_pure_virtual(void)
+{
+    abort();
+}
+
+void __cxa_deleted_virtual(void)
+{
+    abort();
+}
+
diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json
index 01d5f3bf..b5bfd62e 100644
--- a/package/package_esp32_index.template.json
+++ b/package/package_esp32_index.template.json
@@ -45,10 +45,10 @@
           "systems": [
             {
               "host": "i686-mingw32",
-              "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0.zip",
-              "archiveFileName": "xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0.zip",
-              "checksum": "SHA-256:d3f726fec691cf3c36593dd4dd8dfad196b989b5f2b462ac30e284ef61df3960",
-              "size": "76220698"
+              "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-59.zip",
+              "archiveFileName": "xtensa-esp32-elf-win32-1.22.0-59.zip",
+              "checksum": "SHA-256:10476b9c11a7a90f40883413ddfb409f505b20692e316c4e597c4c175b4be09c",
+              "size": "153527527"
             },
             {
               "host": "x86_64-apple-darwin",
@@ -66,8 +66,8 @@
             },
             {
               "host": "i686-pc-linux-gnu",
-              "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz",
-              "archiveFileName": "xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz",
+              "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-59.tar.gz",
+              "archiveFileName": "xtensa-esp32-elf-linux32-1.22.0-59.tar.gz",
               "checksum": "SHA-256:b24817819f0078fb05895a640e806e0aca9aa96b47b80d2390ac8e2d9ddc955a",
               "size": "32734156"
             }