Support Dwarf 5

JDRaftKeeper · Sep 11, 2024 · ca01838 · ca01838
1 parent 78c8285
commit ca01838
Show file tree

Hide file tree

Showing 12 changed files with 1,173 additions and 438 deletions.
diff --git a/base/daemon/BaseDaemon.cpp b/base/daemon/BaseDaemon.cpp
@@ -736,7 +736,7 @@ void BaseDaemon::initializeTerminationAndSignalProcessing()
     std::string executable_path = getExecutablePath();
 
     if (!executable_path.empty())
-        stored_binary_hash = RK::Elf(executable_path).getBinaryHash();
+        stored_binary_hash = RK::Elf(executable_path).getStoredBinaryHash();
 #endif
 }
 

diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
@@ -90,6 +90,7 @@ if (WEVERYTHING)
     no_warning(vla)
     no_warning(weak-template-vtables)
     no_warning(weak-vtables)
+    no_warning(thread-safety-negative) # experimental flag, too many false positives
 
     # XXX: libstdc++ has some of these for 3way compare
     if (NOT USE_LIBCXX)

diff --git a/contrib/boost b/contrib/boost
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
@@ -119,32 +119,6 @@ if (NOT EXTERNAL_BOOST_FOUND)
     add_library (boost::program_options ALIAS _boost_program_options)
     target_include_directories (_boost_program_options SYSTEM BEFORE PUBLIC ${LIBRARY_DIR})
 
-    # regex
-
-    set (SRCS_REGEX
-        ${LIBRARY_DIR}/libs/regex/src/c_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/cpp_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/cregex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/fileiter.cpp
-        ${LIBRARY_DIR}/libs/regex/src/icu.cpp
-        ${LIBRARY_DIR}/libs/regex/src/instances.cpp
-        ${LIBRARY_DIR}/libs/regex/src/internals.hpp
-        ${LIBRARY_DIR}/libs/regex/src/posix_api.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_debug.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_raw_buffer.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_traits_defaults.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/static_mutex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/usinstances.cpp
-        ${LIBRARY_DIR}/libs/regex/src/w32_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/wc_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/wide_posix_api.cpp
-        ${LIBRARY_DIR}/libs/regex/src/winstances.cpp
-    )
-
-    add_library (_boost_regex ${SRCS_REGEX})
-    add_library (boost::regex ALIAS _boost_regex)
-    target_include_directories (_boost_regex PRIVATE ${LIBRARY_DIR})
 
     # system
 
@@ -173,7 +147,6 @@ if (NOT EXTERNAL_BOOST_FOUND)
                 ${LIBRARY_DIR}/libs/context/src/fiber.cpp
                 ${LIBRARY_DIR}/libs/context/src/continuation.cpp
                 ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-                ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
                 ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
     elseif (ARCH_ARM)
@@ -182,7 +155,6 @@ if (NOT EXTERNAL_BOOST_FOUND)
             ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-            ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
             ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
     elseif(OS_DARWIN)
@@ -191,7 +163,6 @@ if (NOT EXTERNAL_BOOST_FOUND)
             ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S
             ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-            ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
             ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
     else()
@@ -200,7 +171,6 @@ if (NOT EXTERNAL_BOOST_FOUND)
             ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S
             ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-            ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
             ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
         )
     endif()

diff --git a/contrib/libcxx b/contrib/libcxx
diff --git a/contrib/libcxx-cmake/CMakeLists.txt b/contrib/libcxx-cmake/CMakeLists.txt
@@ -3,70 +3,96 @@ include(CheckCXXCompilerFlag)
 set(LIBCXX_SOURCE_DIR ${RaftKeeper_SOURCE_DIR}/contrib/libcxx)
 
 set(SRCS
-${LIBCXX_SOURCE_DIR}/src/algorithm.cpp
-${LIBCXX_SOURCE_DIR}/src/any.cpp
-${LIBCXX_SOURCE_DIR}/src/atomic.cpp
-${LIBCXX_SOURCE_DIR}/src/barrier.cpp
-${LIBCXX_SOURCE_DIR}/src/bind.cpp
-${LIBCXX_SOURCE_DIR}/src/charconv.cpp
-${LIBCXX_SOURCE_DIR}/src/chrono.cpp
-${LIBCXX_SOURCE_DIR}/src/condition_variable.cpp
-${LIBCXX_SOURCE_DIR}/src/condition_variable_destructor.cpp
-${LIBCXX_SOURCE_DIR}/src/debug.cpp
-${LIBCXX_SOURCE_DIR}/src/exception.cpp
-${LIBCXX_SOURCE_DIR}/src/experimental/memory_resource.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/directory_iterator.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/int128_builtins.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/operations.cpp
-${LIBCXX_SOURCE_DIR}/src/functional.cpp
-${LIBCXX_SOURCE_DIR}/src/future.cpp
-${LIBCXX_SOURCE_DIR}/src/hash.cpp
-${LIBCXX_SOURCE_DIR}/src/ios.cpp
-${LIBCXX_SOURCE_DIR}/src/ios.instantiations.cpp
-${LIBCXX_SOURCE_DIR}/src/iostream.cpp
-${LIBCXX_SOURCE_DIR}/src/locale.cpp
-${LIBCXX_SOURCE_DIR}/src/memory.cpp
-${LIBCXX_SOURCE_DIR}/src/mutex.cpp
-${LIBCXX_SOURCE_DIR}/src/mutex_destructor.cpp
-${LIBCXX_SOURCE_DIR}/src/new.cpp
-${LIBCXX_SOURCE_DIR}/src/optional.cpp
-${LIBCXX_SOURCE_DIR}/src/random.cpp
-${LIBCXX_SOURCE_DIR}/src/random_shuffle.cpp
-${LIBCXX_SOURCE_DIR}/src/regex.cpp
-${LIBCXX_SOURCE_DIR}/src/shared_mutex.cpp
-${LIBCXX_SOURCE_DIR}/src/stdexcept.cpp
-${LIBCXX_SOURCE_DIR}/src/string.cpp
-${LIBCXX_SOURCE_DIR}/src/strstream.cpp
-${LIBCXX_SOURCE_DIR}/src/system_error.cpp
-${LIBCXX_SOURCE_DIR}/src/thread.cpp
-${LIBCXX_SOURCE_DIR}/src/typeinfo.cpp
-${LIBCXX_SOURCE_DIR}/src/utility.cpp
-${LIBCXX_SOURCE_DIR}/src/valarray.cpp
-${LIBCXX_SOURCE_DIR}/src/variant.cpp
-${LIBCXX_SOURCE_DIR}/src/vector.cpp
+"${LIBCXX_SOURCE_DIR}/src/algorithm.cpp"
+"${LIBCXX_SOURCE_DIR}/src/any.cpp"
+"${LIBCXX_SOURCE_DIR}/src/atomic.cpp"
+"${LIBCXX_SOURCE_DIR}/src/barrier.cpp"
+"${LIBCXX_SOURCE_DIR}/src/bind.cpp"
+"${LIBCXX_SOURCE_DIR}/src/charconv.cpp"
+"${LIBCXX_SOURCE_DIR}/src/chrono.cpp"
+"${LIBCXX_SOURCE_DIR}/src/condition_variable.cpp"
+"${LIBCXX_SOURCE_DIR}/src/condition_variable_destructor.cpp"
+"${LIBCXX_SOURCE_DIR}/src/debug.cpp"
+"${LIBCXX_SOURCE_DIR}/src/exception.cpp"
+"${LIBCXX_SOURCE_DIR}/src/experimental/memory_resource.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/directory_iterator.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/int128_builtins.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/operations.cpp"
+"${LIBCXX_SOURCE_DIR}/src/format.cpp"
+"${LIBCXX_SOURCE_DIR}/src/functional.cpp"
+"${LIBCXX_SOURCE_DIR}/src/future.cpp"
+"${LIBCXX_SOURCE_DIR}/src/hash.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ios.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ios.instantiations.cpp"
+"${LIBCXX_SOURCE_DIR}/src/iostream.cpp"
+"${LIBCXX_SOURCE_DIR}/src/legacy_debug_handler.cpp"
+"${LIBCXX_SOURCE_DIR}/src/legacy_pointer_safety.cpp"
+"${LIBCXX_SOURCE_DIR}/src/locale.cpp"
+"${LIBCXX_SOURCE_DIR}/src/memory.cpp"
+"${LIBCXX_SOURCE_DIR}/src/mutex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/mutex_destructor.cpp"
+"${LIBCXX_SOURCE_DIR}/src/new.cpp"
+"${LIBCXX_SOURCE_DIR}/src/optional.cpp"
+"${LIBCXX_SOURCE_DIR}/src/random.cpp"
+"${LIBCXX_SOURCE_DIR}/src/random_shuffle.cpp"
+"${LIBCXX_SOURCE_DIR}/src/regex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ryu/d2fixed.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ryu/d2s.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ryu/f2s.cpp"
+"${LIBCXX_SOURCE_DIR}/src/shared_mutex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/stdexcept.cpp"
+"${LIBCXX_SOURCE_DIR}/src/string.cpp"
+"${LIBCXX_SOURCE_DIR}/src/strstream.cpp"
+"${LIBCXX_SOURCE_DIR}/src/system_error.cpp"
+"${LIBCXX_SOURCE_DIR}/src/thread.cpp"
+"${LIBCXX_SOURCE_DIR}/src/typeinfo.cpp"
+"${LIBCXX_SOURCE_DIR}/src/utility.cpp"
+"${LIBCXX_SOURCE_DIR}/src/valarray.cpp"
+"${LIBCXX_SOURCE_DIR}/src/variant.cpp"
+"${LIBCXX_SOURCE_DIR}/src/vector.cpp"
+"${LIBCXX_SOURCE_DIR}/src/verbose_abort.cpp"
 )
 
 add_library(cxx ${SRCS})
+set_target_properties(cxx PROPERTIES FOLDER "contrib/libcxx-cmake")
 
-target_include_directories(cxx SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBCXX_SOURCE_DIR}/include>)
+target_include_directories(cxx SYSTEM BEFORE PRIVATE $<BUILD_INTERFACE:${LIBCXX_SOURCE_DIR}/src>)
+target_include_directories(cxx SYSTEM BEFORE PUBLIC  $<BUILD_INTERFACE:${LIBCXX_SOURCE_DIR}/include>)
 target_compile_definitions(cxx PRIVATE -D_LIBCPP_BUILDING_LIBRARY -DLIBCXX_BUILDING_LIBCXXABI)
 
 # Enable capturing stack traces for all exceptions.
 if (USE_UNWIND)
     target_compile_definitions(cxx PUBLIC -DSTD_EXCEPTION_HAS_STACK_TRACE=1)
 endif ()
 
+if (USE_MUSL)
+    target_compile_definitions(cxx PUBLIC -D_LIBCPP_HAS_MUSL_LIBC=1)
+endif ()
+
+# Override the deduced attribute support that causes error.
+if (OS_DARWIN AND COMPILER_GCC)
+    add_compile_definitions(_LIBCPP_INIT_PRIORITY_MAX)
+endif ()
+
 target_compile_options(cxx PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>)
 
 # Third party library may have substandard code.
 target_compile_options(cxx PRIVATE -w)
 
+# Enable support for Clang-Thread-Safety-Analysis in libcxx
+target_compile_definitions(cxx PUBLIC -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS)
+
 target_link_libraries(cxx PUBLIC cxxabi)
 
+# For __udivmodti4, __divmodti4.
+if (OS_DARWIN AND COMPILER_GCC)
+    target_link_libraries(cxx PRIVATE gcc)
+endif ()
+
 install(
-    TARGETS cxx
-    EXPORT global
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION lib
-    LIBRARY DESTINATION lib
-)
+        TARGETS cxx
+        EXPORT global
+        ARCHIVE DESTINATION lib
+        RUNTIME DESTINATION lib
+        LIBRARY DESTINATION lib
+)
diff --git a/contrib/libcxxabi b/contrib/libcxxabi
diff --git a/contrib/libcxxabi-cmake/CMakeLists.txt b/contrib/libcxxabi-cmake/CMakeLists.txt
@@ -1,34 +1,37 @@
 set(LIBCXXABI_SOURCE_DIR ${RaftKeeper_SOURCE_DIR}/contrib/libcxxabi)
 
 set(SRCS
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_stdexcept.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_virtual.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_thread_atexit.cpp
-${LIBCXXABI_SOURCE_DIR}/src/fallback_malloc.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_guard.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_default_handlers.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_personality.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_exception.cpp
-${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_demangle.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_exception.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_handlers.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_exception_storage.cpp
-${LIBCXXABI_SOURCE_DIR}/src/private_typeinfo.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_typeinfo.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_aux_runtime.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_vector.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_new_delete.cpp
+        "${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_aux_runtime.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_default_handlers.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_demangle.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_exception.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_exception_storage.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_guard.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_handlers.cpp"
+        # "${LIBCXXABI_SOURCE_DIR}/src/cxa_noexception.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_personality.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_thread_atexit.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_vector.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/cxa_virtual.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/fallback_malloc.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/private_typeinfo.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/stdlib_exception.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/stdlib_new_delete.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/stdlib_stdexcept.cpp"
+        "${LIBCXXABI_SOURCE_DIR}/src/stdlib_typeinfo.cpp"
 )
 
 add_library(cxxabi ${SRCS})
+set_target_properties(cxxabi PROPERTIES FOLDER "contrib/libcxxabi-cmake")
 
 # Third party library may have substandard code.
 target_compile_options(cxxabi PRIVATE -w)
 
 target_include_directories(cxxabi SYSTEM BEFORE
-    PUBLIC $<BUILD_INTERFACE:${LIBCXXABI_SOURCE_DIR}/include>
-    PRIVATE $<BUILD_INTERFACE:${LIBCXXABI_SOURCE_DIR}/../libcxx/include>
+        PUBLIC $<BUILD_INTERFACE:${LIBCXXABI_SOURCE_DIR}/include>
+        PRIVATE $<BUILD_INTERFACE:${LIBCXXABI_SOURCE_DIR}/../libcxx/include>
+        PRIVATE $<BUILD_INTERFACE:${LIBCXXABI_SOURCE_DIR}/../libcxx/src>
 )
 target_compile_definitions(cxxabi PRIVATE -D_LIBCPP_BUILDING_LIBRARY)
 target_compile_options(cxxabi PRIVATE -nostdinc++ -fno-sanitize=undefined -Wno-macro-redefined) # If we don't disable UBSan, infinite recursion happens in dynamic_cast.
@@ -40,9 +43,9 @@ if (USE_UNWIND)
 endif ()
 
 install(
-    TARGETS cxxabi
-    EXPORT global
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION lib
-    LIBRARY DESTINATION lib
-)
+        TARGETS cxxabi
+        EXPORT global
+        ARCHIVE DESTINATION lib
+        RUNTIME DESTINATION lib
+        LIBRARY DESTINATION lib
+)