mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #6020
3816ac2
build: fix building on Windows due to _FORTIFY_SOURCE changes in MSYS2 (iDunk5400)78b076c
Windows: enable high-entropy ASLR where available (iDunk5400)
This commit is contained in:
commit
4e2b139e72
1 changed files with 7 additions and 4 deletions
|
@ -620,7 +620,7 @@ else()
|
||||||
add_cxx_flag_if_supported(-Wformat-security CXX_SECURITY_FLAGS)
|
add_cxx_flag_if_supported(-Wformat-security CXX_SECURITY_FLAGS)
|
||||||
|
|
||||||
# -fstack-protector
|
# -fstack-protector
|
||||||
if (NOT WIN32 AND NOT OPENBSD)
|
if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
|
||||||
add_c_flag_if_supported(-fstack-protector C_SECURITY_FLAGS)
|
add_c_flag_if_supported(-fstack-protector C_SECURITY_FLAGS)
|
||||||
add_cxx_flag_if_supported(-fstack-protector CXX_SECURITY_FLAGS)
|
add_cxx_flag_if_supported(-fstack-protector CXX_SECURITY_FLAGS)
|
||||||
add_c_flag_if_supported(-fstack-protector-strong C_SECURITY_FLAGS)
|
add_c_flag_if_supported(-fstack-protector-strong C_SECURITY_FLAGS)
|
||||||
|
@ -628,9 +628,11 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# New in GCC 8.2
|
# New in GCC 8.2
|
||||||
if (NOT WIN32 AND NOT OPENBSD)
|
if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
|
||||||
add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS)
|
add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS)
|
||||||
add_cxx_flag_if_supported(-fcf-protection=full CXX_SECURITY_FLAGS)
|
add_cxx_flag_if_supported(-fcf-protection=full CXX_SECURITY_FLAGS)
|
||||||
|
endif()
|
||||||
|
if (NOT WIN32 AND NOT OPENBSD)
|
||||||
add_c_flag_if_supported(-fstack-clash-protection C_SECURITY_FLAGS)
|
add_c_flag_if_supported(-fstack-clash-protection C_SECURITY_FLAGS)
|
||||||
add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS)
|
add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS)
|
||||||
endif()
|
endif()
|
||||||
|
@ -642,8 +644,8 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# linker
|
# linker
|
||||||
if (NOT WIN32)
|
if (NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
|
||||||
# Windows binaries die on startup with PIE
|
# Windows binaries die on startup with PIE when compiled with GCC <9.x
|
||||||
add_linker_flag_if_supported(-pie LD_SECURITY_FLAGS)
|
add_linker_flag_if_supported(-pie LD_SECURITY_FLAGS)
|
||||||
endif()
|
endif()
|
||||||
add_linker_flag_if_supported(-Wl,-z,relro LD_SECURITY_FLAGS)
|
add_linker_flag_if_supported(-Wl,-z,relro LD_SECURITY_FLAGS)
|
||||||
|
@ -667,6 +669,7 @@ else()
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
add_linker_flag_if_supported(-Wl,--dynamicbase LD_SECURITY_FLAGS)
|
add_linker_flag_if_supported(-Wl,--dynamicbase LD_SECURITY_FLAGS)
|
||||||
add_linker_flag_if_supported(-Wl,--nxcompat LD_SECURITY_FLAGS)
|
add_linker_flag_if_supported(-Wl,--nxcompat LD_SECURITY_FLAGS)
|
||||||
|
add_linker_flag_if_supported(-Wl,--high-entropy-va LD_SECURITY_FLAGS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
|
message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
|
||||||
|
|
Loading…
Reference in a new issue