phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-09 11:27:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 1ef9f7ca4a into 433412fd84

Browse source
This commit is contained in:
Vasil Dimov 2025-01-07 18:14:57 +01:00 committed by GitHub
commit 050c6abe2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
CMakeLists.txt
View file

@ -521,6 +521,33 @@ if(ENABLE_HARDENING)
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
try_append_linker_flag("-Wl,-fixup_chains" TARGET hardening_interface)
endif()
if(HAVE_LIBCPP)
# https://libcxx.llvm.org/Hardening.html
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(hardening_interface INTERFACE _LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
else()
target_compile_definitions(hardening_interface INTERFACE _LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST)
endif()
endif()
if(HAVE_LIBSTDCPP)
# https://gcc.gnu.org/wiki/LibstdcxxDebugMode
# https://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html
#
# libstdc++ has _GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC but they are not ABI compatible with
# normal mode which could cause linkage failures like:
# undefined reference to `mp::Connection::removeSyncCleanup(__gnu_debug::_Safe_iterator...`
# when an external library is not compiled with _GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC,
# so we use _GLIBCXX_ASSERTIONS in both Debug and non-Debug builds.
target_compile_definitions(hardening_interface INTERFACE _GLIBCXX_ASSERTIONS)
find_library(HAVE_LIBSTDCPPEXP stdc++exp)
if(HAVE_LIBSTDCPPEXP)
target_compile_definitions(hardening_interface INTERFACE _GLIBCXX_DEBUG_BACKTRACE)
target_link_libraries(hardening_interface INTERFACE stdc++exp)
endif()
endif()
endif()
endif()

3
cmake/introspection.cmake
View file

@ -12,6 +12,9 @@ check_include_file_cxx(sys/resources.h HAVE_SYS_RESOURCES_H)
check_include_file_cxx(sys/vmmeter.h HAVE_SYS_VMMETER_H)
check_include_file_cxx(vm/vm_param.h HAVE_VM_VM_PARAM_H)
check_cxx_symbol_exists(_LIBCPP_VERSION "version" HAVE_LIBCPP)
check_cxx_symbol_exists(__GLIBCXX__ "version" HAVE_LIBSTDCPP)
check_cxx_symbol_exists(O_CLOEXEC "fcntl.h" HAVE_O_CLOEXEC)
check_cxx_symbol_exists(fdatasync "unistd.h" HAVE_FDATASYNC)
check_cxx_symbol_exists(fork "unistd.h" HAVE_DECL_FORK)

6
depends/hosts/linux.mk
View file

@ -13,12 +13,6 @@ linux_release_CXXFLAGS=$(linux_release_CFLAGS)
linux_debug_CFLAGS=-O1 -g
linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
# https://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html
linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
# https://libcxx.llvm.org/Hardening.html
linux_debug_CPPFLAGS+=-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG
ifeq (86,$(findstring 86,$(build_arch)))
i686_linux_CC=gcc -m32
i686_linux_CXX=g++ -m32