Skip to content

Commit 35316de

Browse files
committed
revert toolchain for windows
1 parent 3b874d5 commit 35316de

File tree

2 files changed

+43
-6
lines changed

2 files changed

+43
-6
lines changed

Diff for: cores/esp32/main.cpp

+37
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,40 @@ extern "C" void app_main()
1919
}
2020

2121
#endif
22+
23+
/*
24+
** Block below to be removed with next toolchain
25+
*/
26+
void *operator new(size_t size)
27+
{
28+
return malloc(size);
29+
}
30+
31+
void *operator new[](size_t size)
32+
{
33+
return malloc(size);
34+
}
35+
36+
void operator delete(void * ptr)
37+
{
38+
free(ptr);
39+
}
40+
41+
void operator delete[](void * ptr)
42+
{
43+
free(ptr);
44+
}
45+
46+
extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
47+
extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
48+
49+
void __cxa_pure_virtual(void)
50+
{
51+
abort();
52+
}
53+
54+
void __cxa_deleted_virtual(void)
55+
{
56+
abort();
57+
}
58+

Diff for: package/package_esp32_index.template.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
"systems": [
4646
{
4747
"host": "i686-mingw32",
48-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0.zip",
49-
"archiveFileName": "xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0.zip",
50-
"checksum": "SHA-256:d3f726fec691cf3c36593dd4dd8dfad196b989b5f2b462ac30e284ef61df3960",
51-
"size": "76220698"
48+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-59.zip",
49+
"archiveFileName": "xtensa-esp32-elf-win32-1.22.0-59.zip",
50+
"checksum": "SHA-256:10476b9c11a7a90f40883413ddfb409f505b20692e316c4e597c4c175b4be09c",
51+
"size": "153527527"
5252
},
5353
{
5454
"host": "x86_64-apple-darwin",
@@ -66,8 +66,8 @@
6666
},
6767
{
6868
"host": "i686-pc-linux-gnu",
69-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz",
70-
"archiveFileName": "xtensa-esp32-elf-linux32-1.22.0-61-gab8375a-5.2.0.tar.gz",
69+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-59.tar.gz",
70+
"archiveFileName": "xtensa-esp32-elf-linux32-1.22.0-59.tar.gz",
7171
"checksum": "SHA-256:b24817819f0078fb05895a640e806e0aca9aa96b47b80d2390ac8e2d9ddc955a",
7272
"size": "32734156"
7373
}

0 commit comments

Comments
 (0)