esp8266
diff --git a/‎cores/esp8266/Arduino.h
+1-1 b/‎cores/esp8266/Arduino.h
+1-1
diff --git a/‎cores/esp8266/abi.cpp
-78 b/‎cores/esp8266/abi.cpp
-78
diff --git a/‎cores/esp8266/core_esp8266_main.cpp
+31 b/‎cores/esp8266/core_esp8266_main.cpp
+31
diff --git a/‎cores/esp8266/core_esp8266_postmortem.c
+9 b/‎cores/esp8266/core_esp8266_postmortem.c
+9
diff --git a/‎cores/esp8266/libc_replacements.c
+1-1 b/‎cores/esp8266/libc_replacements.c
+1-1
@@ -254,7 +254,7 @@ const int TIM_DIV265 __attribute__((deprecated, weak)) = TIM_DIV256;
 #ifdef __cplusplus
 
 #include <algorithm>
-#include "pgmspace.h"
+#include <pgmspace.h>
 
 #include "WCharacter.h"
 #include "WString.h"
 
@@ -28,36 +28,6 @@ using __cxxabiv1::__guard;
 extern void *umm_last_fail_alloc_addr;
 extern int umm_last_fail_alloc_size;
 
-void *operator new(size_t size)
-{
-    void *ret = malloc(size);
-    if (0 != size && 0 == ret) {
-        umm_last_fail_alloc_addr = __builtin_return_address(0);
-        umm_last_fail_alloc_size = size;
-    }
-    return ret;
-}
-
-void *operator new[](size_t size)
-{
-    void *ret = malloc(size);
-    if (0 != size && 0 == ret) {
-        umm_last_fail_alloc_addr = __builtin_return_address(0);
-        umm_last_fail_alloc_size = size;
-    }
-    return ret;
-}
-
-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__));
 
@@ -98,53 +68,5 @@ extern "C" void __cxa_guard_abort(__guard* pg)
     xt_wsr_ps(reinterpret_cast<guard_t*>(pg)->ps);
 }
 
-
-namespace std
-{
-void __throw_bad_function_call()
-{
-    panic();
-}
-
-void __throw_length_error(char const*)
-{
-    panic();
-}
-
-void __throw_bad_alloc()
-{
-    panic();
-}
-
-void __throw_logic_error(const char* str)
-{
-    (void) str;
-    panic();
-}
-
-void __throw_out_of_range(const char* str)
-{
-    (void) str;
-    panic();
-}
-
-void __throw_bad_cast(void)
-{
-    panic();
-}
-
-void __throw_ios_failure(const char* str)
-{
-    (void) str;
-    panic();
-}
-
-void __throw_runtime_error(const char* str)
-{
-    (void) str;
-    panic();
-}
-} // namespace std
-
 // TODO: rebuild windows toolchain to make this unnecessary:
 void* __dso_handle;
@@ -134,16 +134,47 @@ static void loop_task(os_event_t *events) {
         panic();
     }
 }
+extern "C" {
+
+struct object { long placeholder[ 10 ]; };
+void __register_frame_info (const void *begin, struct object *ob);
+extern char __eh_frame[];
+}
 
 static void do_global_ctors(void) {
+    static struct object ob;
+    __register_frame_info( __eh_frame, &ob );
+
     void (**p)(void) = &__init_array_end;
     while (p != &__init_array_start)
         (*--p)();
 }
 
+extern "C" {
+extern void __unhandled_exception(const char *str);
+
+static void  __unhandled_exception_cpp()
+{
+    static bool terminating;
+    if (terminating)
+        abort();
+    terminating = true;
+    /* Use a trick from vterminate.cc to get any std::exception what() */
+    try {
+        __throw_exception_again;
+    } catch (const std::exception& e) {
+        __unhandled_exception( e.what() );
+    } catch (...) {
+        __unhandled_exception( "" );
+    }
+}
+
+}
+
 void init_done() {
     system_set_os_print(1);
     gdb_init();
+    std::set_terminate(__unhandled_exception_cpp);
     do_global_ctors();
     esp_schedule();
 }
 
@@ -40,6 +40,7 @@ static const char* s_panic_func = 0;
 static const char* s_panic_what = 0;
 
 static bool s_abort_called = false;
+static const char* s_unhandled_exception = NULL;
 
 void abort() __attribute__((noreturn));
 static void uart_write_char_d(char c);
@@ -119,6 +120,9 @@ void __wrap_system_restart_local() {
         }
         ets_putc('\n');
     }
+    else if (s_unhandled_exception) {
+        ets_printf_P("\nUnhandled exception: %s\n", s_unhandled_exception);
+    }
     else if (s_abort_called) {
         ets_printf_P("\nAbort called\n");
     }
@@ -233,6 +237,11 @@ void abort() {
     raise_exception();
 }
 
+void __unhandled_exception(const char *str) {
+    s_unhandled_exception = str;
+    raise_exception();
+}
+
 void __assert_func(const char *file, int line, const char *func, const char *what) {
     s_panic_file = file;
     s_panic_line = line;
 
@@ -128,4 +128,4 @@ void _exit(int status) {
 int atexit(void (*func)()) {
     (void) func;
     return 0;
-}
+}