1 files changed, 11 insertions, 3 deletions
diff --git a/libcxxabi/src/temporary.cpp b/libcxxabi/src/temporary.cpp
index 03701e19c4c..76f6b913397 100644
--- a/libcxxabi/src/temporary.cpp
+++ b/libcxxabi/src/temporary.cpp
@@ -7,14 +7,22 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "abort_message.h"
+
 #pragma GCC visibility push(default)
 
 extern "C"
 {
 
-void (*__cxa_new_handler)() = 0;
-void (*__cxa_terminate_handler)() = 0;
-void (*__cxa_unexpected_handler)() = 0;
+static
+void f()
+{
+    abort_message("this shouldn't be called");
+}
+
+void (*__cxa_new_handler)() = f;
+void (*__cxa_terminate_handler)() = f;
+void (*__cxa_unexpected_handler)() = f;
 
 }