From 586995da4728f10831c45615b43139c0d7b36a24 Mon Sep 17 00:00:00 2001
From: "Ithamar R. Adema" <ithamar@upgrade-android.com>
Date: Sat, 30 Aug 2014 16:50:46 -0700
Subject: [PATCH] ARM: make ARM C++ unwind stubs panic

As suggested by Francois, thanks for paying attention!
---
 src/system/kernel/util/kernel_cpp.cpp | 78 ++++++++++++++-------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/system/kernel/util/kernel_cpp.cpp b/src/system/kernel/util/kernel_cpp.cpp
index 1dad95ee88..52ee3e660b 100644
--- a/src/system/kernel/util/kernel_cpp.cpp
+++ b/src/system/kernel/util/kernel_cpp.cpp
@@ -69,42 +69,6 @@ __cxa_finalize(void* dsoHandle)
 {
 }
 
-/* ARM */
-extern "C" void
-__aeabi_unwind_cpp_pr0(void)
-{
-}
-
-extern "C" void
-__aeabi_unwind_cpp_pr1(void)
-{
-}
-
-extern "C" void
-__aeabi_unwind_cpp_pr2(void)
-{
-}
-
-extern "C" void
-_Unwind_Complete(void)
-{
-}
-
-extern "C" void
-_Unwind_VRS_Set(void)
-{
-}
-
-extern "C" void
-_Unwind_VRS_Get(void)
-{
-}
-
-extern "C" void
-__gnu_unwind_frame(void)
-{
-}
-
 #endif
 
 // full C++ support in the kernel
@@ -282,6 +246,48 @@ __register_frame_info()
 	panic("__register_frame_info");
 }
 
+/* ARM */
+extern "C" void
+__aeabi_unwind_cpp_pr0(void)
+{
+	panic("__aeabi_unwind_cpp_pr0");
+}
+
+extern "C" void
+__aeabi_unwind_cpp_pr1(void)
+{
+	panic("__aeabi_unwind_cpp_pr1");
+}
+
+extern "C" void
+__aeabi_unwind_cpp_pr2(void)
+{
+	panic("__aeabi_unwind_cpp_pr2");
+}
+
+extern "C" void
+_Unwind_Complete(void)
+{
+	panic("_Unwind_Complete");
+}
+
+extern "C" void
+_Unwind_VRS_Set(void)
+{
+	panic("_Unwind_VRS_Set");
+}
+
+extern "C" void
+_Unwind_VRS_Get(void)
+{
+	panic("_Unwind_VRS_Get");
+}
+
+extern "C" void
+__gnu_unwind_frame(void)
+{
+	panic("__gnu_unwind_frame");
+}
 
 #endif	// __GNUC__ >= 4