Project: replace libelf with libelfin

.github/workflows/debug.yml

@@ -207,6 +207,8 @@ jobs:
           }
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Ccache
         uses: hendrikmuhs/[email protected] # https://github.com/hendrikmuhs/ccache-action/issues/181

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "riscv-tests"]
 	path = tests/riscv-official/riscv-tests
 	url = https://github.com/riscv-software-src/riscv-tests.git
+[submodule "external/libelfin"]
+	path = external/libelfin
+	url = https://github.com/mortbopet/libelfin

CMakeLists.txt

@@ -226,30 +226,11 @@ if ("${WASM}")
 else ()
     # Not available for WASM
     enable_testing()
-
-    if (NOT "${FORCE_ELFLIB_STATIC}")
-        find_package(LibElf)
-        if ("${LibElf_FOUND}")
-            include(CheckSymbolExists)
-            check_symbol_exists(EM_RISCV "gelf.h" LIBELF_HAS_RISCV)
-            if ("${LIBELF_HAS_RISCV}")
-                # Turn non-cmake library into a cmake target
-                add_library(libelf INTERFACE)
-                target_link_libraries(libelf INTERFACE ${LIBELF_LIBRARY})
-                target_include_directories(libelf INTERFACE ${LIBELF_INCLUDE_DIR})
-                message(STATUS "Using system libelf")
-            else ()
-                message(STATUS "System libelf does not support RISC-V")
-                set(LibElf_FOUND FALSE) # Force fallback
-            endif ()
-        endif ()
-    endif ()
 endif ()
 
-if ("${WASM}" OR "${FORCE_ELFLIB_STATIC}" OR NOT "${LibElf_FOUND}")
-    message(STATUS "Using local libelf fallback.")
-    add_subdirectory("external/libelf")
-endif ()
+set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+set(CMAKE_PROJECT_libelfin_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibElfinSettings.cmake")
+add_subdirectory("external/libelfin")
 
 # Detect Qt used qt version
 # Based on article https://www.steinzone.de/wordpress/how-to-support-both-qt5-and-qt6-using-cmake/

cmake/FindPythonInterp.cmake

@@ -0,0 +1,21 @@
+# Compatibility wrapper for CMake > 3.12 where FindPythonInterp is deprecated/removed
+# This allows external projects using the old module to work with newer CMake and Python3
+
+find_package(Python3 COMPONENTS Interpreter QUIET)
+
+if(Python3_Interpreter_FOUND)
+    set(PYTHONINTERP_FOUND TRUE)
+    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+    set(PYTHON_VERSION_STRING ${Python3_VERSION})
+    set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR})
+    set(PYTHON_VERSION_MINOR ${Python3_VERSION_MINOR})
+    set(PYTHON_VERSION_PATCH ${Python3_VERSION_PATCH})
+
+    if(NOT PythonInterp_FIND_QUIETLY)
+        message(STATUS "Found PythonInterp (via Python3): ${PYTHON_EXECUTABLE} (found version \"${PYTHON_VERSION_STRING}\")")
+    endif()
+else()
+    if(PythonInterp_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)")
+    endif()
+endif()

cmake/LibElfinSettings.cmake

@@ -0,0 +1,7 @@
+if(POLICY CMP0148)
+    cmake_policy(SET CMP0148 OLD)
+endif()
+
+# Libelfin requires Threads for dwarf++ library
+find_package(Threads REQUIRED)
+