🐛 (patch) Wrap _Unwind_Resume (#78)

When using LTO, the compiler may emit a `_Unwind_Resume` call rather
than a `__cxa_end_cleanup` at the end of a landing pad. Calling GCC's
unwinder while the estell unwinder is running will be UB. This wraps
that API to call our `__cxa_end_cleanup`. The pointer to the
current exception object passed to _Unwind_Resume, is ignored.

Author: kammce

conanfile.py

@@ -112,33 +112,38 @@ def package_info(self):
         self.cpp_info.set_property("cmake_target_name", "libhal::exceptions")
         lib_path = os.path.join(self.package_folder,
                                 'lib', 'liblibhal-exceptions.a')
-
+        using_wrap = False
         if self.options.runtime == "estell":
+            using_wrap = True
             self.cpp_info.exelinkflags.extend([
                 "-fexceptions",
                 "-Wl,--wrap=__cxa_throw",
                 "-Wl,--wrap=__cxa_rethrow",
                 "-Wl,--wrap=__cxa_end_catch",
                 "-Wl,--wrap=__cxa_begin_catch",
                 "-Wl,--wrap=__cxa_end_cleanup",
+                "-Wl,--wrap=_Unwind_Resume",
                 "-Wl,--wrap=__gnu_unwind_pr_common",
                 "-Wl,--wrap=__aeabi_unwind_cpp_pr0",
+                "-Wl,--wrap=__aeabi_unwind_cpp_pr1",
+                "-Wl,--wrap=__aeabi_unwind_cpp_pr2",
                 "-Wl,--wrap=_sig_func",
                 "-Wl,--wrap=__gxx_personality_v0",
                 "-Wl,--wrap=deregister_tm_clones",
                 "-Wl,--wrap=register_tm_clones",
-                # Ensure that all symbols are added to the linker's symbol table
-                "-Wl,--whole-archive",
-                lib_path,
-                "-Wl,--no-whole-archive",
             ])
 
         # Keep this for now, will update this for the runtime select
         if self._is_arm_cortex:
+            using_wrap = True
             self.cpp_info.exelinkflags.extend([
                 "-Wl,--wrap=__cxa_allocate_exception",
                 "-Wl,--wrap=__cxa_free_exception",
                 "-Wl,--wrap=__cxa_call_unexpected",
+            ])
+
+        if using_wrap:
+            self.cpp_info.exelinkflags.extend([
                 # Ensure that all symbols are added to the linker's symbol table
                 "-Wl,--whole-archive",
                 lib_path,

demos/CMakeLists.txt

@@ -21,9 +21,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --save-temps")
 libhal_build_demos(
   DEMOS
   single_level
-  multi_levels
-  multiple_virtual_inheritance
-  results
+  multiple_inheritance
 
   INCLUDES
   .
@@ -38,6 +36,5 @@ libhal_build_demos(
   -fno-threadsafe-statics
 
   LINK_FLAGS
-  -Wl,-Map=link.map
   -fno-threadsafe-statics
 )